diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-27 00:49:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-27 00:49:09 +0000 |
| commit | cdffc783f4789b78ec2535056bb30799767f1206 (patch) | |
| tree | 65924574be12d4ba14c1eab6e8566af14abc1172 /pym/_emerge | |
| parent | 20f99522ed450be5c5d6b2e65395283ad389d6db (diff) | |
| download | portage-cdffc783f4789b78ec2535056bb30799767f1206.tar.gz portage-cdffc783f4789b78ec2535056bb30799767f1206.tar.bz2 portage-cdffc783f4789b78ec2535056bb30799767f1206.zip | |
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
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
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: |