From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9DCA8139694 for ; Tue, 4 Apr 2017 03:20:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C764CE0DBA; Tue, 4 Apr 2017 03:20:33 +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 A295AE0DBA for ; Tue, 4 Apr 2017 03:20:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C4D033BEBE for ; Tue, 4 Apr 2017 03:20:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A49871DC for ; Tue, 4 Apr 2017 03:20:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1491275959.f05d0864653e082bd60db67b52132c4ba6515339.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildBuild.py pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f05d0864653e082bd60db67b52132c4ba6515339 X-VCS-Branch: master Date: Tue, 4 Apr 2017 03:20:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c38481e9-09d0-4ee9-b4b7-ad8a24b02eb9 X-Archives-Hash: a1c4957a0f2efd1a197fa1326c4536be commit: f05d0864653e082bd60db67b52132c4ba6515339 Author: Zac Medico gentoo org> AuthorDate: Mon Apr 3 01:50:45 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 4 03:19:19 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f05d0864 EbuildBuild: eliminate call to digestgen (bug 614116) Eliminate the call to digestgen in EbuildBuild._fetchonly_exit, and make Scheduler._generate_digests call it earlier when --fetchonly is enabled. This avoids event loop recursion which is not compatible with asyncio (digestgen makes many calls that can trigger event loop recursion). X-Gentoo-bug: 614116 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=614116 Acked-by: Brian Dolbec gentoo.org> pym/_emerge/EbuildBuild.py | 5 ----- pym/_emerge/Scheduler.py | 3 --- 2 files changed, 8 deletions(-) diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 001f55fff..11eb1c93e 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -21,7 +21,6 @@ from _emerge.TaskSequence import TaskSequence import portage from portage import _encodings, _unicode_decode, _unicode_encode, os from portage.package.ebuild.digestcheck import digestcheck -from portage.package.ebuild.digestgen import digestgen from portage.package.ebuild.doebuild import _check_temp_dir from portage.package.ebuild._spawn_nofetch import spawn_nofetch @@ -168,10 +167,6 @@ class EbuildBuild(CompositeTask): if self.returncode != os.EX_OK: portdb = self.pkg.root_config.trees[self._tree].dbapi spawn_nofetch(portdb, self._ebuild_path, settings=self.settings) - elif 'digest' in self.settings.features: - if not digestgen(mysettings=self.settings, - myportdb=self.pkg.root_config.trees[self._tree].dbapi): - self.returncode = 1 self.wait() def _pre_clean_exit(self, pre_clean_phase): diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 58ff97139..079fac7b9 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -616,9 +616,6 @@ class Scheduler(PollScheduler): tasks are started. """ - if '--fetchonly' in self.myopts: - return os.EX_OK - digest = '--digest' in self.myopts if not digest: for pkgsettings in self.pkgsettings.values():