aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-11-27 17:40:50 -0800
committerZac Medico <zmedico@gentoo.org>2019-11-27 17:42:26 -0800
commita107f5bad841e5fad65298881e5a1feb9ffdbed1 (patch)
treef5f0429829ce6dd08ec48064cce1ab7dd3ee5e18 /lib/_emerge/depgraph.py
parenteapply: Output verbosely only if patch fails to apply with -F0 (diff)
downloadportage-a107f5bad841e5fad65298881e5a1feb9ffdbed1.tar.gz
portage-a107f5bad841e5fad65298881e5a1feb9ffdbed1.tar.bz2
portage-a107f5bad841e5fad65298881e5a1feb9ffdbed1.zip
depgraph: fix buildtime_blockers logic
Fixes: 1b3131db0e22 ("emerge --buildpkgonly: respect buildtime hard blockers") Bug: https://bugs.gentoo.org/689226 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py4
1 files changed, 1 insertions, 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