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 2148545caab00eda9599d0ba9e37c2f91d9f60cb..7309fb138c5007f637c664ddccea8607f416773d 100644 (file)
--- 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):