Merge the internal package set changes from trunk r14614 (bug #266454). None

of these changes should be noticeable to users. This is just to keep the diff
relative to trunk as small as possible.

svn path=/main/branches/2.1.7/; revision=14642

1 files changed, 12 insertions, 12 deletions

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index caf6e8e68..ef8b92cc5 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -424,22 +424,22 @@ def unmerge(root_config, myopts, unmerge_action,
 					raise UninstallFailure(retval)
 				sys.exit(retval)
 			else:
-				if clean_world and hasattr(sets["world"], "cleanPackage")\
-						and hasattr(sets["world"], "lock"):
-					sets["world"].lock()
-					if hasattr(sets["world"], "load"):
-						sets["world"].load()
-					sets["world"].cleanPackage(vartree.dbapi, y)
-					sets["world"].unlock()
+				if clean_world and hasattr(sets["selected"], "cleanPackage")\
+						and hasattr(sets["selected"], "lock"):
+					sets["selected"].lock()
+					if hasattr(sets["selected"], "load"):
+						sets["selected"].load()
+					sets["selected"].cleanPackage(vartree.dbapi, y)
+					sets["selected"].unlock()
 				emergelog(xterm_titles, " >>> unmerge success: "+y)
 
-	if clean_world and hasattr(sets["world"], "remove")\
-			and hasattr(sets["world"], "lock"):
-		sets["world"].lock()
+	if clean_world and hasattr(sets["selected"], "remove")\
+			and hasattr(sets["selected"], "lock"):
+		sets["selected"].lock()
 		# load is called inside remove()
 		for s in root_config.setconfig.active:
-			sets["world"].remove(SETPREFIX+s)
-		sets["world"].unlock()
+			sets["selected"].remove(SETPREFIX + s)
+		sets["selected"].unlock()
 
 	return 1