1 |
Author: zmedico |
2 |
Date: 2008-05-27 00:49:09 +0000 (Tue, 27 May 2008) |
3 |
New Revision: 10438 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Bug #223685 - Use the finally clause to collect elog messages just |
9 |
before releasing the build dir lock, so they never get missed. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-27 00:11:47 UTC (rev 10437) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-27 00:49:09 UTC (rev 10438) |
16 |
@@ -5955,9 +5955,6 @@ |
17 |
pkgsettings, self.edebug, mydbapi=portdb, |
18 |
tree="porttree") |
19 |
del pkgsettings["PORTAGE_BINPKG_TMPFILE"] |
20 |
- if retval != os.EX_OK or \ |
21 |
- "--buildpkgonly" in self.myopts: |
22 |
- elog_process(pkg_key, pkgsettings, phasefilter=filter_mergephases) |
23 |
if retval != os.EX_OK: |
24 |
return retval |
25 |
bintree = self.trees[myroot]["bintree"] |
26 |
@@ -6009,6 +6006,8 @@ |
27 |
return retval |
28 |
finally: |
29 |
if builddir_lock: |
30 |
+ elog_process(pkg.cpv, pkgsettings, |
31 |
+ phasefilter=filter_mergephases) |
32 |
portage.locks.unlockdir(builddir_lock) |
33 |
try: |
34 |
if not catdir_lock: |
35 |
|
36 |
-- |
37 |
gentoo-commits@l.g.o mailing list |