[patch] Make emerge --deselect work for sets.

portage-emerge-deselect-for-sets.patch (text/plain), 1.68 KB, created by Sebastian Luther (few) on 2009-06-27 19:34:26 UTC

Index: pym/_emerge/actions.py
===================================================================
--- pym/_emerge/actions.py	(revision 13715)
+++ pym/_emerge/actions.py	(working copy)
@@ -1189,11 +1189,12 @@
 	expanded_atoms = set(atoms)
 	from portage.dep import Atom
 	for atom in atoms:
-		for cpv in vardb.match(atom):
-			slot, = vardb.aux_get(cpv, ['SLOT'])
-			if not slot:
-				slot = '0'
-			expanded_atoms.add(Atom('%s:%s' % (portage.cpv_getkey(cpv), slot)))
+		if not atom.startswith(SETPREFIX):
+			for cpv in vardb.match(atom):
+				slot, = vardb.aux_get(cpv, ['SLOT'])
+				if not slot:
+					slot = '0'
+				expanded_atoms.add(Atom('%s:%s' % (portage.cpv_getkey(cpv), slot)))
 
 	pretend = '--pretend' in opts
 	locked = False
@@ -1204,14 +1205,16 @@
 		discard_atoms = set()
 		world_set.load()
 		for atom in world_set:
-			if not isinstance(atom, Atom):
-				# nested set
-				continue
 			for arg_atom in expanded_atoms:
-				if arg_atom.intersects(atom) and \
-					not (arg_atom.slot and not atom.slot):
-					discard_atoms.add(atom)
-					break
+				if arg_atom.startswith(SETPREFIX):
+					if arg_atom == atom:
+						discard_atoms.add(atom)
+						break
+				else:
+					if arg_atom.intersects(atom) and \
+						not (arg_atom.slot and not atom.slot):
+						discard_atoms.add(atom)
+						break
 		if discard_atoms:
 			for atom in sorted(discard_atoms):
 				print ">>> Removing %s from \"world\" favorites file..." % \
@@ -2260,6 +2263,9 @@
 			# multiple files in a single iter_owners() call.
 			lookup_owners.append(x)
 
+		elif x.startswith(SETPREFIX) and action == "deselect":
+			valid_atoms.append(x)
+
 		else:
 			msg = []
 			msg.append("'%s' is not a valid package atom." % (x,))