diff options
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 7 |
1 files 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" |