diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-10 02:00:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-10 02:00:53 +0000 |
| commit | 2b0b2be3cf91f2cff18cdb2a18024feea02153a2 (patch) | |
| tree | 9c82cbdd0aaa2acad714eb0db1dc9fb8d013f307 | |
| parent | dd8139157618041992a384ab05f5dfb6b962ffa5 (diff) | |
| download | portage-2b0b2be3cf91f2cff18cdb2a18024feea02153a2.tar.gz portage-2b0b2be3cf91f2cff18cdb2a18024feea02153a2.tar.bz2 portage-2b0b2be3cf91f2cff18cdb2a18024feea02153a2.zip | |
If category expansion fails against the portage tree, remove the null/ prefix so that it may be given another chance to expand against the binary package tree in select_dep(). See bug #135834.
svn path=/main/trunk/; revision=3829
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 5d07b2f3d..d018af9ee 100755 --- a/bin/emerge +++ b/bin/emerge @@ -869,6 +869,12 @@ class depgraph: try: mykey = portage.dep_expand(x, mydb=portdb, settings=pkgsettings) + if mykey.startswith("null/"): + # If category expansion fails against the portage tree, + # remove the null/ prefix so that it may be given + # another chance to expand against the binary package + # tree in select_dep(). + mykey = mykey[5:] except ValueError, errpkgs: print "\n\n!!! The short ebuild name \"" + x + "\" is ambiguous. Please specify" print "!!! one of the following fully-qualified ebuild names instead:\n" |