From 996077a6d244a0483ad8744b9f91c48197a89ed5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 5 Mar 2007 00:13:31 +0000 Subject: Avoid pointless population of the binary tree when --buildpkg is enabled. Thanks to vapier for reporting. (trunk r6174:6175) svn path=/main/branches/2.1.2/; revision=6176 --- bin/emerge | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index d5b870dd3..d499eb7db 100755 --- 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" % \ -- cgit v1.2.3-1-g7c22