summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-27 00:50:40 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-27 00:50:40 +0000
commit14f57f3e373431f271286bd8c4896700e17088f2 (patch)
tree836b38672fffc67c87567975e20d708a503589bd /bin
parent4d4dd49ed27d04a7e163fbe799304a9b379ef4bb (diff)
downloadportage-14f57f3e373431f271286bd8c4896700e17088f2.tar.gz
portage-14f57f3e373431f271286bd8c4896700e17088f2.tar.bz2
portage-14f57f3e373431f271286bd8c4896700e17088f2.zip
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
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge4
1 files changed, 1 insertions, 3 deletions
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: