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 aefc94b..e11c7dd 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -332,10 +332,9 @@
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:
