From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3632 invoked by alias); 24 Jul 2013 20:51:56 -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 3600 invoked by uid 89); 24 Jul 2013 20:51:56 -0000 X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_50,KHOP_THREADED,RCVD_IN_DNSWL_NONE,RCVD_IN_HOSTKARMA_NO,RDNS_NONE,SPF_PASS autolearn=no version=3.3.1 Received: from Unknown (HELO mail-in-08.arcor-online.net) (151.189.21.48) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 24 Jul 2013 20:51:54 +0000 Received: from mail-in-03-z2.arcor-online.net (mail-in-03-z2.arcor-online.net [151.189.8.15]) by mx.arcor.de (Postfix) with ESMTP id 8B3AA3AE4BC for ; Wed, 24 Jul 2013 22:51:46 +0200 (CEST) Received: from mail-in-01.arcor-online.net (mail-in-01.arcor-online.net [151.189.21.41]) by mail-in-03-z2.arcor-online.net (Postfix) with ESMTP id 808501F6004; Wed, 24 Jul 2013 22:51:46 +0200 (CEST) Received: from Rainer.invalid (pD9EB0A73.dip0.t-ipconnect.de [217.235.10.115]) (Authenticated sender: stromeko@arcor.de) by mail-in-01.arcor-online.net (Postfix) with ESMTPSA id 3701C1A; Wed, 24 Jul 2013 22:51:46 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-01.arcor-online.net 3701C1A From: Achim Gratz To: Achim Gratz Cc: cygwin-apps@cygwin.com Subject: Re: [PATCH 4/4 setup] package re-/de-installation from CLI Date: Wed, 24 Jul 2013 20:51:00 -0000 References: <87a9lexyk8.fsf@Rainer.invalid> <20130724115129.GT9689@calimero.vinschen.de> Message-ID: <878v0vadge.fsf@Rainer.invalid> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Virus-Found: No X-SW-Source: 2013-07/txt/msg00297.txt.bz2 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-Implement-deletion-of-orphaned-packages-and-upgradin.patch Content-length: 2075 >From 8d0ee8f914e0af9b6af90909e95a0cd6c3f60215 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 24 Jul 2013 22:14:19 +0200 Subject: [PATCH 4/4] Implement deletion of orphaned packages and upgrading while installing/removing * choose.cc (UpgradeAlsoOption): Add new CLI option -g/--upgrade-also. (CleanOrphansOption): Add new CLI option -o/--delete-orphans. (OnInit): Implement -g/--upgrade-also, considers all installed packages as candidates for upgrades (the default when no CLI package or category options have been given) also when manual additions or removals are requested at the same time. Implement -o/--delete-orphans, considers installed packages that do not exist anymore in the package repositories as candidates for deletion. --- choose.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/choose.cc b/choose.cc index fd75790..0e05796 100644 --- a/choose.cc +++ b/choose.cc @@ -61,6 +61,10 @@ static const char *cvsid = #include "UserSettings.h" +#include "getopt++/BoolOption.h" +static BoolOption UpgradeAlsoOption (false, 'g', "upgrade-also", "also upgrade installed packages"); +static BoolOption CleanOrphansOption (false, 'o', "delete-orphans", "remove orphaned packages"); + using namespace std; extern ThreeBarProgressPage Progress; @@ -248,8 +252,8 @@ ChooserPage::OnInit () bool deleted = pkg.isManuallyDeleted(); bool basemisc = (pkg.categories.find ("Base") != pkg.categories.end () || pkg.categories.find ("Misc") != pkg.categories.end ()); - bool current = pkg.curr; - bool upgrade = wanted || (!pkg.installed && basemisc) || !hasManualSelections; + bool current = pkg.curr || CleanOrphansOption; + bool upgrade = wanted || (!pkg.installed && basemisc) || UpgradeAlsoOption || !hasManualSelections; bool install = wanted && !deleted && !pkg.installed; bool reinstall = (wanted || basemisc ) && deleted; bool uninstall = !(wanted || basemisc ) && deleted; -- 1.8.3.1 --=-=-= Content-Type: text/plain Content-length: 192 Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf rackAttack: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds --=-=-=--