From 2e28368806899da16d4585c2efd554ecdb572ada Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Fri, 2 May 2008 05:09:48 +0000 Subject: do not consider sets to be installed that are about to be unmerged svn path=/main/trunk/; revision=10080 --- pym/_emerge/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7309fb138..bffebf171 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5852,6 +5852,7 @@ def unmerge(root_config, myopts, unmerge_action, if candidates: stop = False installed_sets += candidates + installed_sets = [x for x in installed_sets if x not in root_config.setconfig.active] del stop, pos # we don't want to unmerge packages that are still listed in user-editable package sets @@ -5992,7 +5993,7 @@ def unmerge(root_config, myopts, unmerge_action, if clean_world: sets["world"].cleanPackage(vartree.dbapi, y) emergelog(xterm_titles, " >>> unmerge success: "+y) - if clean_world_ + if clean_world: for s in root_config.setconfig.active: sets["world"].remove(SETPREFIX+s) return 1 -- cgit v1.2.3-1-g7c22