[setup - the official Cygwin setup program] branch master, updated. release_2.893-4-g3103d94

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=3103d94026056f0ba07548dab8ff9f04f4dccb70

commit 3103d94026056f0ba07548dab8ff9f04f4dccb70
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Tue Jul 31 21:29:02 2018 +0200

    Fix message spam when package vendor is something other than "cygwin"
    
    Installed packages are getting coerced to vendor "cygwin", so there will be
    warnings if the vendor string of the single repo is something other than
    that.


Diff:
---
 package_meta.cc |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/package_meta.cc b/package_meta.cc
index f765baf..a7f4cfd 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -183,10 +183,17 @@ packagemeta::add_version (const SolverPool::addPackageData &inpkgdata)
           /* Otherwise... if we had a way to set repo priorities, that could be
              used to control which packageversion the solver picks. For the
              moment, just warn that you might not be getting what you think you
-             should... */
-          Log (LOG_PLAIN) << "Version " << pkgdata.version << " of package " <<
-            name << " is present in releases labelled " << pkgdata.vendor <<
-            " and " << i->Vendor() << endLog;
+             should...
+
+             (suppress this for installed packages, as we are only guessing the
+             vendor, currently)
+          */
+          if (pkgdata.reponame != "_installed")
+            {
+              Log (LOG_PLAIN) << "Version " << pkgdata.version << " of package " <<
+                name << " is present in releases labelled " << pkgdata.vendor <<
+                " and " << i->Vendor() << endLog;
+            }
         }
 
       versions.erase(i);