From e6061b5be28d7bc258bd298cd5b1cb6cf4200815 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 5 Mar 2007 00:11:11 +0000 Subject: Avoid pointless population of the binary tree when --buildpkg is enabled. Thanks to vapier for reporting. svn path=/main/trunk/; revision=6175 --- pym/emerge/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/emerge/__init__.py') 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" % \ -- cgit v1.2.3-1-g7c22