[gentoo-commits] proj/portage:master commit in: lib/_emerge/

[Zac Medico]

commit:     a107f5bad841e5fad65298881e5a1feb9ffdbed1
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 01:40:50 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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