From b4d9a77ef16fe54421dd653ce152d8f45222c567 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Jul 2007 18:06:04 +0000 Subject: When expanding ambiguous atoms against the vardb, make sure the the expanded package is also available in the portage tree. (trunk r7294) svn path=/main/branches/2.1.2/; revision=7295 --- bin/emerge | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/emerge b/bin/emerge index 29753fc36..62a3b71cc 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1584,11 +1584,14 @@ class depgraph: 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" -- cgit v1.2.3-1-g7c22