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 ea7394b2fc59e43b11947a8eefae91c29e365261..1b4983cf928f0af36bdec02cd968f7f09257875d 100755 (executable)
--- 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: