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
<caster@g.o> for reporting.

svn path=/main/trunk/; revision=14761

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index aefc94b36d041c5e39bd619a64b50cca5d8e3309..e11c7dd7c9f0d8dda598ffddc30327539ef00579 100644 (file)
--- 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: