From cdffc783f4789b78ec2535056bb30799767f1206 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 27 May 2008 00:49:09 +0000 Subject: 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 --- pym/_emerge/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 9ec78c053..c4689300c 100644 --- 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: -- cgit v1.2.3-1-g7c22