From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71766 invoked by alias); 16 Oct 2017 19:13:33 -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 71755 invoked by uid 89); 16 Oct 2017 19:13:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=H*m:edu, reverts X-HELO: limerock01.mail.cornell.edu Received: from limerock01.mail.cornell.edu (HELO limerock01.mail.cornell.edu) (128.84.13.241) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 19:13:31 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite4.serverfarm.cornell.edu [10.16.197.9]) by limerock01.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id v9GJDTtF017879; Mon, 16 Oct 2017 15:13:29 -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 v9GJDLXp015875 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 16 Oct 2017 15:13:28 -0400 From: Ken Brown To: cygwin-apps@cygwin.com Subject: [PATCH] Revert "Don't override a Keep selection" Date: Mon, 16 Oct 2017 19:13:00 -0000 Message-Id: <20171016191321.9504-1-kbrown@cornell.edu> X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-10/txt/msg00064.txt.bz2 This reverts (the rest of) commit b43b697. Part of that commit was already reverted in commit ff0bb3d. The rest is not needed either since we no longer send the upgrade flag to the solver after the user has made their selections. --- libsolv.cc | 14 +++----------- libsolv.h | 1 - package_meta.h | 2 -- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/libsolv.cc b/libsolv.cc index 78e73a8..9aad102 100644 --- a/libsolv.cc +++ b/libsolv.cc @@ -512,7 +512,6 @@ SolverTasks::setTasks() // decode UI state to action // skip and keep don't change dependency solution - // except when we want to keep an old version if (pkg->installed != pkg->desired) { if (pkg->desired) @@ -520,13 +519,9 @@ SolverTasks::setTasks() else add(pkg->installed, taskUninstall); // uninstall } - else if (pkg->installed) - { - if (pkg->picked()) - add(pkg->installed, taskReinstall); // reinstall - else if (pkg->installed < pkg->default_version) - add(pkg->installed, taskKeep); // keep - } + else if (pkg->picked()) + add(pkg->installed, taskReinstall); // reinstall + // only install action makes sense for source packages if (pkg->srcpicked()) { @@ -696,9 +691,6 @@ SolverSolution::update(SolverTasks &tasks, updateMode update, bool use_test_pack // we don't know how to ask solver for this, so we just add the erase // and install later break; - case SolverTasks::taskKeep: - queue_push2(&job, SOLVER_LOCK | SOLVER_SOLVABLE, sv.id); - break; default: Log (LOG_PLAIN) << "unknown task " << (*i).second << endLog; } diff --git a/libsolv.h b/libsolv.h index e448841..04233fc 100644 --- a/libsolv.h +++ b/libsolv.h @@ -182,7 +182,6 @@ class SolverTasks taskInstall, taskUninstall, taskReinstall, - taskKeep, }; void add(const SolvableVersion &v, task t) { diff --git a/package_meta.h b/package_meta.h index d91f7c9..b6faab8 100644 --- a/package_meta.h +++ b/package_meta.h @@ -131,8 +131,6 @@ public: packageversion curr; /* ditto for "test" (experimental) */ packageversion exp; - /* which one is the default according to the chooser global state */ - packageversion default_version; /* Now for the user stuff :] */ /* What version does the user want ? */ packageversion desired; -- 2.14.2