From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 54795 invoked by alias); 4 Oct 2018 12:23:04 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 54779 invoked by uid 9795); 4 Oct 2018 12:23:04 -0000 Date: Thu, 04 Oct 2018 12:23:00 -0000 Message-ID: <20181004122304.54751.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.893-4-g3103d94 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e084ed380e29d07e3dca3e43f30342e6d2a4f674 X-Git-Newrev: 3103d94026056f0ba07548dab8ff9f04f4dccb70 X-SW-Source: 2018-q4/txt/msg00000.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=3103d94026056f0ba07548dab8ff9f04f4dccb70 commit 3103d94026056f0ba07548dab8ff9f04f4dccb70 Author: Achim Gratz 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);