From 2b0b2be3cf91f2cff18cdb2a18024feea02153a2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 10 Jul 2006 02:00:53 +0000 Subject: [PATCH] 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 --- bin/emerge | 6 ++++++ 1 file changed, 6 insertions(+) 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" -- 2.26.2