From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 7 Nov 2007 08:15:49 +0000 (-0000)
Subject: Fix broken logic for --update greedy slot atoms in
X-Git-Tag: v2.2_pre1~428
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e080043cdbadd2d386baf72f6543ca8d4856227d;p=portage.git

Fix broken logic for --update greedy slot atoms in
depgraph.select_files().

svn path=/main/trunk/; revision=8452
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 66af63957..7cf132cd4 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1819,12 +1819,14 @@ class depgraph(object):
 					print
 					return False, myfavorites
 
-		if "--update" in self.myopts and not mysets:
+		if "--update" in self.myopts:
 			# Enable greedy SLOT atoms for atoms given as arguments.
 			# This is currently disabled for sets since greedy SLOT
 			# atoms could be a property of the set itself.
 			greedy_atoms = []
 			for myarg, atom in arg_atoms:
+				if myarg.startswith(SETPREFIX):
+					continue
 				greedy_atoms.append((myarg, atom))
 				for greedy_atom in self._greedy_slot_atoms(myroot, atom):
 					greedy_atoms.append((myarg, greedy_atom))