If category expansion fails against the portage tree, remove the null/ prefix so...

svn path=/main/trunk/; revision=3829

diff --git a/bin/emerge b/bin/emerge
index 5d07b2f3d9aa5f9deb979fe1b69175b8c93d77a8..d018af9ee858672c60a6bbf853f2d6dee67914d1 100755 (executable)
--- 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"