diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:13:31 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:13:31 +0000 |
commit | 996077a6d244a0483ad8744b9f91c48197a89ed5 (patch) | |
tree | 45fe69a7d6d62af5452302fcb95bd81069d8ad9d | |
parent | 06bf4685fcbdd603de86e46c54f5c1990af70c4c (diff) | |
download | portage-996077a6d244a0483ad8744b9f91c48197a89ed5.tar.gz portage-996077a6d244a0483ad8744b9f91c48197a89ed5.tar.bz2 portage-996077a6d244a0483ad8744b9f91c48197a89ed5.zip |
Avoid pointless population of the binary tree when --buildpkg is enabled. Thanks to vapier for reporting. (trunk r6174:6175)
svn path=/main/branches/2.1.2/; revision=6176
-rwxr-xr-x | bin/emerge | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index d5b870dd3..d499eb7db 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3090,10 +3090,10 @@ class MergeTask(object): tree="porttree") if retval != os.EX_OK: return retval - if "--buildpkgonly" not in self.myopts: - bintree = self.trees[myroot]["bintree"] + bintree = self.trees[myroot]["bintree"] + if bintree.populated: bintree.inject(pkg_key) - mytbz2 = bintree.getname(pkg_key) + if "--buildpkgonly" not in self.myopts: msg = " === (%s of %s) Merging (%s::%s)" % \ (mergecount, len(mymergelist), pkg_key, y) short_msg = "emerge: (%s of %s) %s Merge" % \ |