diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-07-17 18:06:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-17 18:06:04 +0000 |
| commit | b4d9a77ef16fe54421dd653ce152d8f45222c567 (patch) | |
| tree | 6f2d0c6104d359ef6b368336f6a50c9607e87bcc /bin/emerge | |
| parent | When dep_expand throws a ValueError due to an ambiguous atom, try to expand t... (diff) | |
| download | portage-multirepo-b4d9a77ef16fe54421dd653ce152d8f45222c567.tar.gz portage-multirepo-b4d9a77ef16fe54421dd653ce152d8f45222c567.tar.bz2 portage-multirepo-b4d9a77ef16fe54421dd653ce152d8f45222c567.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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" |