1 |
This fixes conflicting behavior when EMERGE_DEFAULT_OPTS |
2 |
contains --autounmask=n. |
3 |
|
4 |
X-Gentoo-bug: 619612 |
5 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=619612 |
6 |
--- |
7 |
pym/_emerge/depgraph.py | 3 +++ |
8 |
pym/portage/tests/emerge/test_simple.py | 3 ++- |
9 |
2 files changed, 5 insertions(+), 1 deletion(-) |
10 |
|
11 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
12 |
index 726835dd4..92c519c6f 100644 |
13 |
--- a/pym/_emerge/depgraph.py |
14 |
+++ b/pym/_emerge/depgraph.py |
15 |
@@ -9463,6 +9463,9 @@ def backtrack_depgraph(settings, trees, myopts, myparams, |
16 |
|
17 |
def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, spinner): |
18 |
|
19 |
+ if "--autounmask-continue" in myopts: |
20 |
+ myopts["--autounmask"] = True |
21 |
+ |
22 |
debug = "--debug" in myopts |
23 |
mydepgraph = None |
24 |
max_retries = myopts.get('--backtrack', 10) |
25 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
26 |
index 5930f6cc8..1114dc053 100644 |
27 |
--- a/pym/portage/tests/emerge/test_simple.py |
28 |
+++ b/pym/portage/tests/emerge/test_simple.py |
29 |
@@ -311,7 +311,8 @@ pkg_preinst() { |
30 |
emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"), |
31 |
emerge_cmd + ("-C", "--quiet", "dev-libs/B"), |
32 |
|
33 |
- emerge_cmd + ("--autounmask-continue", "dev-libs/C",), |
34 |
+ # --autounmask-continue overrides --autounmask=n |
35 |
+ emerge_cmd + ("--autounmask=n", "--autounmask-continue", "dev-libs/C",), |
36 |
# Verify that the above --autounmask-continue command caused |
37 |
# USE=flag to be applied correctly to dev-libs/D. |
38 |
portageq_cmd + ("match", eroot, "dev-libs/D[flag]"), |
39 |
-- |
40 |
2.13.0 |