From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 104845 invoked by alias); 4 Apr 2018 15:51:15 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 104804 invoked by uid 89); 4 Apr 2018 15:51:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:822 X-HELO: limerock04.mail.cornell.edu Received: from limerock04.mail.cornell.edu (HELO limerock04.mail.cornell.edu) (128.84.13.244) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Apr 2018 15:51:13 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite3.serverfarm.cornell.edu [10.16.197.8]) by limerock04.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id w34FpBGd018620; Wed, 4 Apr 2018 11:51:11 -0400 Received: from nothing.nyroc.rr.com (mta-68-175-129-7.twcny.rr.com [68.175.129.7] (may be forged)) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id w34Fp2SL030791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 4 Apr 2018 11:51:10 -0400 From: Ken Brown To: cygwin-apps@cygwin.com Subject: [PATCH setup 2/2] Fix detection of automatically added packages Date: Wed, 04 Apr 2018 15:51:00 -0000 Message-Id: <20180404155101.9620-3-kbrown@cornell.edu> In-Reply-To: <20180404155101.9620-1-kbrown@cornell.edu> References: <20180404155101.9620-1-kbrown@cornell.edu> X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2018-04/txt/msg00003.txt.bz2 In the "confirm" dialog, report a package as automatically added for install if the version being installed is different from the version requested by the user. This can happen if the global update mode is "Keep" but a package needs to be updated because of a versioned dependency. --- confirm.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confirm.cc b/confirm.cc index 92360cc..1e7127a 100644 --- a/confirm.cc +++ b/confirm.cc @@ -109,7 +109,7 @@ ConfirmPage::OnActivate() line += i->version.Canonical_version(); if (i->version.Type() == package_source) line += " (source)"; - else if (pkg && !pkg->desired) + else if (pkg && pkg->desired != pv) line += " (automatically added)"; line += "\r\n"; install.push_back (line); -- 2.16.2