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 D488C138334 for ; Thu, 28 Nov 2019 01:43:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D8F8E093D; Thu, 28 Nov 2019 01:43:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71407E093D for ; Thu, 28 Nov 2019 01:43:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 035CA34D4F6 for ; Thu, 28 Nov 2019 01:43:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E55FD8B1 for ; Thu, 28 Nov 2019 01:43:46 +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: <1574905346.a107f5bad841e5fad65298881e5a1feb9ffdbed1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/depgraph.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a107f5bad841e5fad65298881e5a1feb9ffdbed1 X-VCS-Branch: master Date: Thu, 28 Nov 2019 01:43:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ef3d2cf-d562-43af-a04a-fa44df864eee X-Archives-Hash: a455dcbc128bb3106ac7771b8b10d829 commit: a107f5bad841e5fad65298881e5a1feb9ffdbed1 Author: Zac Medico gentoo org> AuthorDate: Thu Nov 28 01:40:50 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Nov 28 01:42:26 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a107f5ba depgraph: fix buildtime_blockers logic Fixes: 1b3131db0e22 ("emerge --buildpkgonly: respect buildtime hard blockers") Bug: https://bugs.gentoo.org/689226 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 6d8e73172..f80b077bc 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -8309,9 +8309,7 @@ class depgraph(object): if blocker.priority.buildtime and blocker.atom.blocker.overlap.forbid: buildtime_blockers.append(blocker) - if unsolvable_blockers and \ - not buildtime_blockers and \ - not self._accept_blocker_conflicts(): + if unsolvable_blockers and (buildtime_blockers or not self._accept_blocker_conflicts()): self._dynamic_config._unsatisfied_blockers_for_display = (tuple(buildtime_blockers) if buildtime_blockers else unsolvable_blockers) self._dynamic_config._serialized_tasks_cache = retlist