From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Nov 2007 08:47:43 +0000 (-0000)
Subject: Fix depgraph._get_arg_for_pkg() so that it compares package
X-Git-Tag: v2.2_pre1~404
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76d35e4517a3254d12f87c165a54dc330ddd7722;p=portage.git

Fix depgraph._get_arg_for_pkg() so that it compares package
types to help ensure a proper match.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b6541bd47..97fc0e1ab 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1708,9 +1708,13 @@ class depgraph(object):
 		for atom in self._set_atoms.iterAtomsForPackage(pkg):
 			refs = atom_arg_map[(atom, pkg.root)]
 			for arg in refs:
-				any_arg = arg
 				if isinstance(arg, PackageArg):
+					# TODO: Implement a better comparison to ensure that
+					#       these two packages really are identical.
+					if arg.package.type_name != pkg.type_name:
+						continue
 					return arg
+				any_arg = arg
 		return any_arg
 
 	def select_files(self, myfiles):