From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D291259CA9 for ; Sat, 26 Mar 2016 23:40:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8354E0883; Sat, 26 Mar 2016 23:40:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B31CE0881 for ; Sat, 26 Mar 2016 23:40:16 +0000 (UTC) Received: from localhost.localdomain (ip68-5-185-102.oc.oc.cox.net [68.5.185.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 4D892340A26; Sat, 26 Mar 2016 23:40:14 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] EbuildBuild: call _record_binpkg_info earlier (bug 578204) Date: Sat, 26 Mar 2016 16:40:02 -0700 Message-Id: <1459035602-5898-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.7.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: eb8c78b6-7b66-4f9b-8b6c-8b0db5a20657 X-Archives-Hash: a355087e028a48f913ba3ff9dc67be24 Replace exit listener usage with a TaskSequence instance, in order to guarantee that _record_binpkg_info executes immediately after EbuildBinpkg. 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 --- pym/_emerge/EbuildBuild.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 95c14e4..2941511 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 @@ -320,13 +321,18 @@ class EbuildBuild(CompositeTask): phase="rpm", scheduler=self.scheduler, settings=self.settings)) else: + # Use task_seq to guarantee that _RecordBinpkgInfo + # is called immediately after EbuildBinpkg, in order + # to solve bug #578204. + task_seq = TaskSequence() task = EbuildBinpkg( background=self.background, pkg=self.pkg, scheduler=self.scheduler, settings=self.settings) - binpkg_tasks.add(task) - task.addExitListener( - self._record_binpkg_info) + task_seq.add(task) + task_seq.add(self._RecordBinpkgInfo( + ebuild_binpkg=task, ebuild_build=self)) + binpkg_tasks.add(task_seq) if binpkg_tasks: self._start_task(binpkg_tasks, self._buildpkg_exit) @@ -335,6 +341,14 @@ class EbuildBuild(CompositeTask): self._final_exit(build) self.wait() + class _RecordBinpkgInfo(AsynchronousTask): + + __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