summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-31 22:37:19 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-31 22:37:19 +0000
commitc20fa1191bd16e0f57231e10eebaf7a674aa655a (patch)
treefdab6c7995d49ddd070d290038208f790057ec1d
parentBug #290921 - Always exit unsuccessfully if -r is not specified and a (diff)
downloadportage-idfetch-c20fa1191bd16e0f57231e10eebaf7a674aa655a.tar.gz
portage-idfetch-c20fa1191bd16e0f57231e10eebaf7a674aa655a.tar.bz2
portage-idfetch-c20fa1191bd16e0f57231e10eebaf7a674aa655a.zip
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
-rw-r--r--pym/_emerge/unmerge.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index aefc94b3..e11c7dd7 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: