From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 8 Feb 2008 10:04:59 +0000 (-0000)
Subject: Fix depgraph.select_files() so that arguments are expanded
X-Git-Tag: v2.1.4.4~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=834a73207880dc95bcd53b65dfdd7f424ad4cd8e;p=portage.git

Fix depgraph.select_files() so that arguments are expanded
against the vardb when expansion against the binary repo
fails in --usepkgonly mode.

svn path=/main/branches/2.1.2/; revision=9295
---

diff --git a/bin/emerge b/bin/emerge
index 3d697502b..d93bf908f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1837,8 +1837,14 @@ class depgraph:
 					if "--usepkg" in self.myopts:
 						mykey = portage.dep_expand(x, mydb=bindb,
 							settings=pkgsettings)
-					if "--usepkgonly" in self.myopts or \
-						(mykey and not portage.dep_getkey(mykey).startswith("null/")):
+					if ("--usepkgonly" in self.myopts or mykey) and \
+						not portage.dep_getkey(mykey).startswith("null/"):
+						arg_atoms.append((x, mykey))
+						continue
+
+					if "--usepkgonly" in self.myopts:
+						mykey = portage.dep_expand(x, mydb=vardb,
+							settings=pkgsettings)
 						arg_atoms.append((x, mykey))
 						continue