diff options
| -rw-r--r-- | pym/emerge/__init__.py | 7 |
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" |