| 1 |
commit: a107f5bad841e5fad65298881e5a1feb9ffdbed1 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 28 01:40:50 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 28 01:42:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a107f5ba |
| 7 |
|
| 8 |
depgraph: fix buildtime_blockers logic |
| 9 |
|
| 10 |
Fixes: 1b3131db0e22 ("emerge --buildpkgonly: respect buildtime hard blockers") |
| 11 |
Bug: https://bugs.gentoo.org/689226 |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
lib/_emerge/depgraph.py | 4 +--- |
| 15 |
1 file changed, 1 insertion(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 18 |
index 6d8e73172..f80b077bc 100644 |
| 19 |
--- a/lib/_emerge/depgraph.py |
| 20 |
+++ b/lib/_emerge/depgraph.py |
| 21 |
@@ -8309,9 +8309,7 @@ class depgraph(object): |
| 22 |
if blocker.priority.buildtime and blocker.atom.blocker.overlap.forbid: |
| 23 |
buildtime_blockers.append(blocker) |
| 24 |
|
| 25 |
- if unsolvable_blockers and \ |
| 26 |
- not buildtime_blockers and \ |
| 27 |
- not self._accept_blocker_conflicts(): |
| 28 |
+ if unsolvable_blockers and (buildtime_blockers or not self._accept_blocker_conflicts()): |
| 29 |
self._dynamic_config._unsatisfied_blockers_for_display = (tuple(buildtime_blockers) |
| 30 |
if buildtime_blockers else unsolvable_blockers) |
| 31 |
self._dynamic_config._serialized_tasks_cache = retlist |
Archives