From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 3 Apr 2008 22:40:56 +0000 (-0000)
Subject: Eliminate a redundant atom from the --update greedy slot expansion code.
X-Git-Tag: v2.2_pre6~262
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b28146f1d0bbe35009879955b79d2d2d1900789;p=portage.git

Eliminate a redundant atom from the --update greedy slot expansion code.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8b6ee4add..117bc448b 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1990,9 +1990,6 @@ class depgraph(object):
 			myslots.add(vardb.aux_get(cpv, ["SLOT"])[0])
 		for myslot in myslots:
 			yield "%s:%s" % (mykey, myslot)
-		# In addition to any installed slots, also try to pull
-		# in the latest new slot that may be available.
-		yield atom
 
 	def _iter_args_for_pkg(self, pkg):
 		# TODO: add multiple $ROOT support
@@ -2221,6 +2218,8 @@ class depgraph(object):
 			# atoms could be a property of the set itself.
 			greedy_atoms = []
 			for arg in args:
+				# In addition to any installed slots, also try to pull
+				# in the latest new slot that may be available.
 				greedy_atoms.append(arg)
 				if not isinstance(arg, (AtomArg, PackageArg)):
 					continue