From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 Mar 2007 00:11:11 +0000 (-0000)
Subject: Avoid pointless population of the binary tree when --buildpkg is enabled.  Thanks... 
X-Git-Tag: v2.2_pre1~1606
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6061b5be28d7bc258bd298cd5b1cb6cf4200815;p=portage.git

Avoid pointless population of the binary tree when --buildpkg is enabled.  Thanks to vapier for reporting.

svn path=/main/trunk/; revision=6175
---

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" % \