summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2008-05-02 05:00:46 +0000
committerMarius Mauch <genone@gentoo.org>2008-05-02 05:00:46 +0000
commitefaea052e0003242826499e532d6a65e57601a5a (patch)
tree1bde94c098a40f24df684be7e65e3b470fc51817
parentproperly remove sets from 'world' when unmerging (diff)
downloadportage-multirepo-efaea052e0003242826499e532d6a65e57601a5a.tar.gz
portage-multirepo-efaea052e0003242826499e532d6a65e57601a5a.tar.bz2
portage-multirepo-efaea052e0003242826499e532d6a65e57601a5a.zip
move cleaning of sets out of package loop
svn path=/main/trunk/; revision=10079
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2148545c..7309fb13 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5991,9 +5991,10 @@ def unmerge(root_config, myopts, unmerge_action,
else:
if clean_world:
sets["world"].cleanPackage(vartree.dbapi, y)
- for s in root_config.setconfig.active:
- sets["world"].remove(SETPREFIX+s)
emergelog(xterm_titles, " >>> unmerge success: "+y)
+ if clean_world_
+ for s in root_config.setconfig.active:
+ sets["world"].remove(SETPREFIX+s)
return 1
def chk_updated_info_files(root, infodirs, prev_mtimes, retval):