public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-apps-cvs@sourceware.org Subject: [rebase - The rebase tool, core of the automatic rebase facility during postinstall] branch master, updated. b3d56e7ba1baf49b2ce71e858e7386037c4b4124 Date: Mon, 18 Jul 2022 20:02:53 +0000 (GMT) [thread overview] Message-ID: <20220718200253.5D97E385277C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/rebase.git;h=b3d56e7ba1baf49b2ce71e858e7386037c4b4124 commit b3d56e7ba1baf49b2ce71e858e7386037c4b4124 Author: Christian Franke <christian.franke@t-online.de> Date: Mon Jul 18 17:06:05 2022 +0200 Fix handling of newly added non-rebaseable DLLs Reset needs_rebasing flag to avoid that such a DLL is later removed from the list due to rebase failure. Add related verbose messages. Diff: --- rebase.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/rebase.c b/rebase.c index 39759a9..1f9f74b 100644 --- a/rebase.c +++ b/rebase.c @@ -705,6 +705,17 @@ merge_image_info () if (verbose) fprintf (stderr, "rebasing %s because not in database yet\n", img_info_list[i].name); } + else if (img_info_list[i].flag.needs_rebasing) + { + /* Not in database yet and not rebaseable. Add without rebasing or + skip if --oblivious is active. */ + img_info_list[i].flag.needs_rebasing = 0; + if (verbose) + fprintf (stderr, "not rebasing %s because file is not writable\n", + img_info_list[i].name); + /* FIXME: Overlaps of DLLs in the database with this DLL will + not be detected below. */ + } } } if (!img_info_rebase_start || force_rebase_flag) @@ -715,7 +726,12 @@ merge_image_info () { /* Test DLLs already in database for writability. */ if (i < img_info_rebase_start) - set_cannot_rebase (&img_info_list[i]); + { + set_cannot_rebase (&img_info_list[i]); + if (img_info_list[i].flag.cannot_rebase == 1 && verbose) + fprintf (stderr, "not rebasing %s because file is not writable\n", + img_info_list[i].name); + } if (!img_info_list[i].flag.cannot_rebase) { img_info_list[i].base = 0;
reply other threads:[~2022-07-18 20:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220718200253.5D97E385277C@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).