From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 May 2008 00:50:40 +0000 (-0000)
Subject: Bug #223685 - Use the finally clause to collect elog messages just
X-Git-Tag: v2.1.5.3~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14f57f3e373431f271286bd8c4896700e17088f2;p=portage.git

Bug #223685 - Use the finally clause to collect elog messages just
before releasing the build dir lock, so they never get missed.
(trunk r10438)

svn path=/main/branches/2.1.2/; revision=10439
---

diff --git a/bin/emerge b/bin/emerge
index ea7394b2f..1b4983cf9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -6041,9 +6041,6 @@ class MergeTask(object):
 						retval = portage.doebuild(y, "package", myroot,
 							pkgsettings, self.edebug, mydbapi=portdb,
 							tree="porttree")
-						if retval != os.EX_OK or \
-							"--buildpkgonly" in self.myopts:
-							portage.elog_process(pkg_key, pkgsettings)
 						if retval != os.EX_OK:
 							return retval
 						bintree = self.trees[myroot]["bintree"]
@@ -6095,6 +6092,7 @@ class MergeTask(object):
 							return retval
 				finally:
 					if builddir_lock:
+						portage.elog_process(pkg.cpv, pkgsettings)
 						portage_locks.unlockdir(builddir_lock)
 					try:
 						if not catdir_lock: