diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-08 10:04:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-08 10:04:59 +0000 |
| commit | 834a73207880dc95bcd53b65dfdd7f424ad4cd8e (patch) | |
| tree | c7f1244f107dee10cd76d3a19ebeabe26875e4eb /bin | |
| parent | b262ae302e626ac6b4a3f8c7dd5a19f571456611 (diff) | |
| download | portage-834a73207880dc95bcd53b65dfdd7f424ad4cd8e.tar.gz portage-834a73207880dc95bcd53b65dfdd7f424ad4cd8e.tar.bz2 portage-834a73207880dc95bcd53b65dfdd7f424ad4cd8e.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 10 |
1 files changed, 8 insertions, 2 deletions
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 |