From 834a73207880dc95bcd53b65dfdd7f424ad4cd8e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 8 Feb 2008 10:04:59 +0000 Subject: 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 --- bin/emerge | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3-1-g7c22