Bug #223685 - Use the finally clause to collect elog messages just

before releasing the build dir lock, so they never get missed.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 9ec78c0535eafa437423db37c5825918ccd09c20..c4689300cf9c5d217eb115230918b061d02c9ffe 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5955,9 +5955,6 @@ class MergeTask(object):
                                                        pkgsettings, self.edebug, mydbapi=portdb,
                                                        tree="porttree")
                                                del pkgsettings["PORTAGE_BINPKG_TMPFILE"]
-                                               if retval != os.EX_OK or \
-                                                       "--buildpkgonly" in self.myopts:
-                                                       elog_process(pkg_key, pkgsettings, phasefilter=filter_mergephases)
                                                if retval != os.EX_OK:
                                                        return retval
                                                bintree = self.trees[myroot]["bintree"]
@@ -6009,6 +6006,8 @@ class MergeTask(object):
                                                        return retval
                                finally:
                                        if builddir_lock:
+                                               elog_process(pkg.cpv, pkgsettings,
+                                                       phasefilter=filter_mergephases)
                                                portage.locks.unlockdir(builddir_lock)
                                        try:
                                                if not catdir_lock: