public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: gratz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.874-7-gcd748b3 Date: Tue, 02 Aug 2016 11:37:00 -0000 [thread overview] Message-ID: <20160802113729.122628.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=cd748b30665765ef862ba885e8beb2ab635c7519 commit cd748b30665765ef862ba885e8beb2ab635c7519 Author: Achim Gratz <Stromeko@Stromeko.DE> Date: Tue Aug 2 10:47:43 2016 +0200 fromcwd.cc: Truncate search at the first extension in preference order * fromcwd.cc (FindVisitor): Truncate search at the first extension found in preference order in the same directory so that no multiple setup files for the same (sub-)mirror are processed by do_local_ini. Diff: --- fromcwd.cc | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/fromcwd.cc b/fromcwd.cc index c5f2b79..791744e 100644 --- a/fromcwd.cc +++ b/fromcwd.cc @@ -74,8 +74,22 @@ public: ext++, fi++) { if (*fi) - found_ini_list.push_back (basePath + SetupArch + "/" - + SetupBaseName + "." + *ext); + { + found_ini_list.push_back (basePath + SetupArch + "/" + + SetupBaseName + "." + *ext); + /* + * Terminate the search after the first setup file + * found, which shadows any setup files with + * extensions later in the preference order in the + * same directory. + * + * FIXME: It would probably be more sensible to return + * all matches (perhaps one list per directory) and + * let do_local_ini pick the first one that parses + * correctly, just like do_remote_ini does. + */ + break; + } } found_ini.assign (setup_ext_list.size (), false); }
reply other threads:[~2016-08-02 11:37 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=20160802113729.122628.qmail@sourceware.org \ --to=gratz@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).