| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-27 00:50:40 +0000 (Tue, 27 May 2008) |
| 3 |
New Revision: 10439 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 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 |
(trunk r10438) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-27 00:49:09 UTC (rev 10438) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-27 00:50:40 UTC (rev 10439) |
| 17 |
@@ -6041,9 +6041,6 @@ |
| 18 |
retval = portage.doebuild(y, "package", myroot, |
| 19 |
pkgsettings, self.edebug, mydbapi=portdb, |
| 20 |
tree="porttree") |
| 21 |
- if retval != os.EX_OK or \ |
| 22 |
- "--buildpkgonly" in self.myopts: |
| 23 |
- portage.elog_process(pkg_key, pkgsettings) |
| 24 |
if retval != os.EX_OK: |
| 25 |
return retval |
| 26 |
bintree = self.trees[myroot]["bintree"] |
| 27 |
@@ -6095,6 +6092,7 @@ |
| 28 |
return retval |
| 29 |
finally: |
| 30 |
if builddir_lock: |
| 31 |
+ portage.elog_process(pkg.cpv, pkgsettings) |
| 32 |
portage_locks.unlockdir(builddir_lock) |
| 33 |
try: |
| 34 |
if not catdir_lock: |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives