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

svn path=/main/branches/2.1.2/; revision=6176

diff --git a/bin/emerge b/bin/emerge
index d5b870dd36d25a728b12eb1c50580894cba48dae..d499eb7db9fcdfabd0525d8367df468ade445a66 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -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" % \