summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-17 18:04:44 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-17 18:04:44 +0000
commite0f6458362d1f822a7fb86a2eccbed7ed2249b1d (patch)
tree286a1a99013274fd01c4335e1243ae75efb572a8
parentc92f44e31e9aa32b9e20a4df4f222d9ab1ca2ee3 (diff)
downloadportage-e0f6458362d1f822a7fb86a2eccbed7ed2249b1d.tar.gz
portage-e0f6458362d1f822a7fb86a2eccbed7ed2249b1d.tar.bz2
portage-e0f6458362d1f822a7fb86a2eccbed7ed2249b1d.zip
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
-rw-r--r--pym/emerge/__init__.py7
1 files changed, 5 insertions, 2 deletions
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"