diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:11:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:11:11 +0000 |
| commit | e6061b5be28d7bc258bd298cd5b1cb6cf4200815 (patch) | |
| tree | 01a7044d9b697c9931b204fa0c0d9a1d30d76265 | |
| parent | 7a7f0435e441c88ab1632d3ba23a6e970683e32a (diff) | |
| download | portage-e6061b5be28d7bc258bd298cd5b1cb6cf4200815.tar.gz portage-e6061b5be28d7bc258bd298cd5b1cb6cf4200815.tar.bz2 portage-e6061b5be28d7bc258bd298cd5b1cb6cf4200815.zip | |
Avoid pointless population of the binary tree when --buildpkg is enabled. Thanks to vapier for reporting.
svn path=/main/trunk/; revision=6175
| -rw-r--r-- | pym/emerge/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index a5ad88afb..1e2a625a8 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3093,10 +3093,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" % \ |