From: Marius Mauch <genone@gentoo.org>
Date: Fri, 2 May 2008 05:00:46 +0000 (-0000)
Subject: move cleaning of sets out of package loop
X-Git-Tag: v2.2_pre6~58
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=efaea052e0003242826499e532d6a65e57601a5a;p=portage.git

move cleaning of sets out of package loop

svn path=/main/trunk/; revision=10079
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2148545ca..7309fb138 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):