From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 86347 invoked by alias); 11 Mar 2016 23:02:02 -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 86321 invoked by uid 10076); 11 Mar 2016 23:02:01 -0000 Date: Fri, 11 Mar 2016 23:02:00 -0000 Message-ID: <20160311230201.86292.qmail@sourceware.org> From: gratz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.873-18-g2f53d97 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bd1723cf115f5b57b2e89d264c09281e4e197a50 X-Git-Newrev: 2f53d97ababb61be8f1ae6494552923e377f488c X-SW-Source: 2016-q1/txt/msg00016.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=2f53d97ababb61be8f1ae6494552923e377f488c commit 2f53d97ababb61be8f1ae6494552923e377f488c Author: Yaakov Selkowitz Date: Fri Mar 11 22:44:43 2016 +0100 Switch to "pending" page instead of category when updating or manually installing packages * choose.cc (ChooserPage::createListview): When updating or manually installing packages, switch directly to the "pending" page of the chooser window instead of the categories since presumably that's where the user wants to check what is going to happen. https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=d6f11c3514582eac5ad86f558c90710874ff635d commit d6f11c3514582eac5ad86f558c90710874ff635d Author: Achim Gratz Date: Fri Mar 11 20:05:15 2016 +0100 Implement option -f/--force-current to ensure that "curr" is selected for all packages * choose.cc (ForceCurrentOption): New boolean option -f/--force-current. (ChooserPage::OnInit): Select "curr" version of the package when ForceCurrentOption is true. This is mainly useful to downgrade packages that were previously installed with their "test" version back to "curr". Diff: --- choose.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/choose.cc b/choose.cc index 19c7e4d..b0e5538 100644 --- a/choose.cc +++ b/choose.cc @@ -64,6 +64,7 @@ static const char *cvsid = #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"); +static BoolOption ForceCurrentOption (false, 'f', "force-current", "select the current version for all packages"); static BoolOption PruneInstallOption (false, 'Y', "prune-install", "prune the installation to only the requested packages"); static BoolOption MirrorOption (false, 'm', "mirror-mode", "Skip availability check when installing from local directory (requires local directory to be clean mirror!)"); @@ -149,7 +150,8 @@ ChooserPage::createListview () exit (11); chooser->init(PickView::views::Category); chooser->Show(SW_SHOW); - chooser->setViewMode (PickView::views::Category); + chooser->setViewMode (UpgradeAlsoOption || hasManualSelections ? + PickView::views::Package : PickView::views::Category); if (!SetDlgItemText (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption ())) Log (LOG_BABBLE) << "Failed to set View button caption %ld" << GetLastError () << endLog; @@ -266,7 +268,7 @@ ChooserPage::OnInit () pkg.set_action (packagemeta::Reinstall_action, pkg.curr); else if (uninstall) pkg.set_action (packagemeta::Uninstall_action, packageversion ()); - else if (PruneInstallOption) + else if (PruneInstallOption || ForceCurrentOption) pkg.set_action (packagemeta::Default_action, pkg.curr); else if (upgrade) pkg.set_action (packagemeta::Default_action, pkg.trustp(true, TRUST_UNKNOWN));