Schedule _record_binpkg_info as a member of a TaskSequence, in order to guarantee that it executes immediately after EbuildBinpkg (and before the tasks that follow). This approach is similar to that used to fix bug 562264.
X-Gentoo-bug: 578204 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=578204 --- [PATCH v3] Added docstring to _RecordBinpkgInfo as suggested by Alexander Berntsen. pym/_emerge/EbuildBuild.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 95c14e4..001f55f 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import io import _emerge.emergelog +from _emerge.AsynchronousTask import AsynchronousTask from _emerge.EbuildExecuter import EbuildExecuter from _emerge.EbuildPhase import EbuildPhase from _emerge.EbuildBinpkg import EbuildBinpkg @@ -325,8 +326,12 @@ class EbuildBuild(CompositeTask): pkg=self.pkg, scheduler=self.scheduler, settings=self.settings) binpkg_tasks.add(task) - task.addExitListener( - self._record_binpkg_info) + # Guarantee that _record_binpkg_info is called + # immediately after EbuildBinpkg. Note that + # task.addExitListener does not provide the + # necessary guarantee (see bug 578204). + binpkg_tasks.add(self._RecordBinpkgInfo( + ebuild_binpkg=task, ebuild_build=self)) if binpkg_tasks: self._start_task(binpkg_tasks, self._buildpkg_exit) @@ -335,6 +340,19 @@ class EbuildBuild(CompositeTask): self._final_exit(build) self.wait() + class _RecordBinpkgInfo(AsynchronousTask): + """ + This class wraps the EbuildBuild _record_binpkg_info method + with an AsynchronousTask interface, so that it can be + scheduled as a member of a TaskSequence. + """ + + __slots__ = ('ebuild_binpkg', 'ebuild_build',) + + def _start(self): + self.ebuild_build._record_binpkg_info(self.ebuild_binpkg) + AsynchronousTask._start(self) + def _buildpkg_exit(self, packager): """ Released build dir lock when there is a failure or -- 2.7.2
