| 1 |
commit: 677e19cc20322485475c771687baf4a917065b9c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 26 21:01:35 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 26 21:21:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=677e19cc |
| 7 |
|
| 8 |
emerge --with-test-deps: use _queue_disjunctive_deps |
| 9 |
|
| 10 |
This delays evaluation of || deps, avoiding possible redundant |
| 11 |
packages and conflicts. |
| 12 |
|
| 13 |
Fixes: 85f0dd173ab7 ("emerge --with-test-deps: allow circular deps") |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/_emerge/depgraph.py | 14 +++++++++----- |
| 17 |
1 file changed, 9 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 20 |
index ed7aeccad..0ee50d5de 100644 |
| 21 |
--- a/lib/_emerge/depgraph.py |
| 22 |
+++ b/lib/_emerge/depgraph.py |
| 23 |
@@ -3426,11 +3426,15 @@ class depgraph(object): |
| 24 |
eapi=pkg.eapi, |
| 25 |
subset={'test'}) |
| 26 |
|
| 27 |
- if test_deps and not self._add_pkg_dep_string( |
| 28 |
- pkg, dep_root, self._priority(runtime_post=True), |
| 29 |
- test_deps, |
| 30 |
- allow_unsatisfied): |
| 31 |
- return 0 |
| 32 |
+ if test_deps: |
| 33 |
+ test_deps = list(self._queue_disjunctive_deps(pkg, |
| 34 |
+ dep_root, self._priority(runtime_post=True), |
| 35 |
+ test_deps)) |
| 36 |
+ |
| 37 |
+ if test_deps and not self._add_pkg_dep_string(pkg, |
| 38 |
+ dep_root, self._priority(runtime_post=True), |
| 39 |
+ test_deps, allow_unsatisfied): |
| 40 |
+ return 0 |
| 41 |
|
| 42 |
dep_string = portage.dep.use_reduce(dep_string, |
| 43 |
uselist=use_enabled, |
Archives