From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Sat, 26 Jun 2010 05:14:17 +0000 (+0200)
Subject: Make --deselect handle all cases of atoms/sets on the cmd line and in @world (bug... 
X-Git-Tag: v2.2_rc68~541
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10c7d5d1a1329f846baad3659486c276dafddbba;p=portage.git

Make --deselect handle all cases of atoms/sets on the cmd line and in @world (bug 325591)
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 9e2c88fe0..bc013483f 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1182,11 +1182,13 @@ def action_deselect(settings, trees, opts, atoms):
 		for atom in world_set:
 			for arg_atom in expanded_atoms:
 				if arg_atom.startswith(SETPREFIX):
-					if arg_atom == atom:
+					if atom.startswith(SETPREFIX) and \
+						arg_atom == atom:
 						discard_atoms.add(atom)
 						break
 				else:
-					if arg_atom.intersects(atom) and \
+					if not atom.startswith(SETPREFIX) and \
+						arg_atom.intersects(atom) and \
 						not (arg_atom.slot and not atom.slot):
 						discard_atoms.add(atom)
 						break