Avoid pointless population of the binary tree when --buildpkg is enabled. Thanks...

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index a5ad88afb33dfa6d349a91ef691072736f257c9b..1e2a625a8c7d3c93fc9fac0ea15cc87e64d3dea0 100644 (file)
--- 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" % \