From 3a78453fd8a3b5d9734a11b839f13e68c84d1c05 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Tue, 27 Mar 2018 13:56:27 -0400 Subject: [PATCH setup] Allow command-line uninstallation of specific orphaned packages Also change the implementation of the "--delete-orphans" option to use the same definition of "orphaned" that's used elsewhere in the code. --- choose.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/choose.cc b/choose.cc index 5a4d3ad..1249efa 100644 --- a/choose.cc +++ b/choose.cc @@ -295,13 +295,13 @@ ChooserPage::applyCommandLinePackageSelection() packagemeta &pkg = *(i->second); bool wanted = pkg.isManuallyWanted(); bool deleted = pkg.isManuallyDeleted(); - bool basemisc = (pkg.categories.find ("Base") != pkg.categories.end () - || pkg.categories.find ("Orphaned") != pkg.categories.end ()); - bool upgrade = wanted || (!pkg.installed && basemisc); + bool base = pkg.categories.find ("Base") != pkg.categories.end (); + bool orphaned = pkg.categories.find ("Orphaned") != pkg.categories.end (); + bool upgrade = wanted || (!pkg.installed && base); bool install = wanted && !deleted && !pkg.installed; - bool reinstall = (wanted || basemisc) && deleted; - bool uninstall = (!(wanted || basemisc) && (deleted || PruneInstallOption)) - || (!pkg.curr && CleanOrphansOption); + bool reinstall = (wanted || base) && deleted; + bool uninstall = (!(wanted || base) && (deleted || PruneInstallOption)) + || (orphaned && CleanOrphansOption); if (install) pkg.set_action (packagemeta::Install_action, pkg.curr); else if (reinstall) -- 2.16.2