From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 Jul 2007 18:04:44 +0000 (-0000)
Subject: When expanding ambiguous atoms against the vardb, make sure the the expanded package... 
X-Git-Tag: v2.2_pre1~1001
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0f6458362d1f822a7fb86a2eccbed7ed2249b1d;p=portage.git

When expanding ambiguous atoms against the vardb, make sure the the expanded package is also available in the portage tree.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 042d2467d..0d506de05 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1502,11 +1502,14 @@ class depgraph(object):
 					try:
 						mykey = portage.dep_expand(x,
 							mydb=portdb, settings=pkgsettings)
-					except ValueError:
+					except ValueError, e:
 						mykey = portage.dep_expand(x,
 							mydb=vardb, settings=pkgsettings)
-						if portage.dep_getkey(mykey).startswith("null/"):
+						cp = portage.dep_getkey(mykey)
+						if cp.startswith("null/") or \
+							cp not in e[0]:
 							raise
+						del e
 					arg_atoms.append((x, mykey))
 				except ValueError, errpkgs:
 					print "\n\n!!! The short ebuild name \"" + x + "\" is ambiguous.  Please specify"