From c20fa1191bd16e0f57231e10eebaf7a674aa655a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 31 Oct 2009 22:37:19 +0000 Subject: Allow unmerge of packages from the "selected" set when a package set such as @unavailable is given on the command line. Thanks to Vlastimil Babka for reporting. svn path=/main/trunk/; revision=14761 --- pym/_emerge/unmerge.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index aefc94b36..e11c7dd7c 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -332,10 +332,9 @@ def unmerge(root_config, myopts, unmerge_action, parents = [] for s in installed_sets: # skip sets that the user requested to unmerge, and skip world - # unless we're unmerging a package set (as the package would be - # removed from "world" later on) - if s in root_config.setconfig.active or \ - (s == "selected" and not root_config.setconfig.active): + # user-selected set, since the package will be removed from + # that set later on. + if s in root_config.setconfig.active or s == "selected": continue if s not in sets: -- cgit v1.2.3-1-g7c22