aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-12-26 13:01:35 -0800
committerZac Medico <zmedico@gentoo.org>2019-12-26 13:21:12 -0800
commit677e19cc20322485475c771687baf4a917065b9c (patch)
tree039c4a08e1a474358c98c03f05c22ca95ea9fb74 /lib/_emerge/depgraph.py
parenteapply: Drop QA warning for fuzz factor. (diff)
downloadportage-677e19cc20322485475c771687baf4a917065b9c.tar.gz
portage-677e19cc20322485475c771687baf4a917065b9c.tar.bz2
portage-677e19cc20322485475c771687baf4a917065b9c.zip
emerge --with-test-deps: use _queue_disjunctive_deps
This delays evaluation of || deps, avoiding possible redundant packages and conflicts. Fixes: 85f0dd173ab7 ("emerge --with-test-deps: allow circular deps") Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index ed7aeccad..0ee50d5de 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -3426,11 +3426,15 @@ class depgraph(object):
eapi=pkg.eapi,
subset={'test'})
- if test_deps and not self._add_pkg_dep_string(
- pkg, dep_root, self._priority(runtime_post=True),
- test_deps,
- allow_unsatisfied):
- return 0
+ if test_deps:
+ test_deps = list(self._queue_disjunctive_deps(pkg,
+ dep_root, self._priority(runtime_post=True),
+ test_deps))
+
+ if test_deps and not self._add_pkg_dep_string(pkg,
+ dep_root, self._priority(runtime_post=True),
+ test_deps, allow_unsatisfied):
+ return 0
dep_string = portage.dep.use_reduce(dep_string,
uselist=use_enabled,