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 | Display blockers at the end of the list so that it will more often be easy fo... (diff) | |
| download | portage-multirepo-996077a6d244a0483ad8744b9f91c48197a89ed5.tar.gz portage-multirepo-996077a6d244a0483ad8744b9f91c48197a89ed5.tar.bz2 portage-multirepo-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
@@ -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" % \ |