diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-31 22:37:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-31 22:37:19 +0000 |
| commit | c20fa1191bd16e0f57231e10eebaf7a674aa655a (patch) | |
| tree | fdab6c7995d49ddd070d290038208f790057ec1d /pym/_emerge | |
| parent | 4e9a6f8cdd4f72ac3a27278a0e730617a1594569 (diff) | |
| download | portage-c20fa1191bd16e0f57231e10eebaf7a674aa655a.tar.gz portage-c20fa1191bd16e0f57231e10eebaf7a674aa655a.tar.bz2 portage-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
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/unmerge.py | 7 |
1 files changed, 3 insertions, 4 deletions
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: |