| 1 |
From: Alexander Berntsen <alexander@××××××.net> |
| 2 |
|
| 3 |
Signed-off-by: Alexander Berntsen <bernalex@g.o> |
| 4 |
--- |
| 5 |
pym/_emerge/depgraph.py | 10 +++++++--- |
| 6 |
1 file changed, 7 insertions(+), 3 deletions(-) |
| 7 |
|
| 8 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 9 |
index bfa63fa..37b3a54 100644 |
| 10 |
--- a/pym/_emerge/depgraph.py |
| 11 |
+++ b/pym/_emerge/depgraph.py |
| 12 |
@@ -418,7 +418,8 @@ class _dynamic_depgraph_config(object): |
| 13 |
self._backtrack_infos = {} |
| 14 |
|
| 15 |
self._buildpkgonly_deps_unsatisfied = False |
| 16 |
- self._autounmask = True |
| 17 |
+ self._autounmask = \ |
| 18 |
+ depgraph._frozen_config.myopts.get("--autounmask") != 'n' |
| 19 |
self._success_without_autounmask = False |
| 20 |
self._traverse_ignored_deps = False |
| 21 |
self._complete_mode = False |
| 22 |
@@ -7333,8 +7334,11 @@ class depgraph(object): |
| 23 |
""" |
| 24 |
|
| 25 |
ask = "--ask" in self._frozen_config.myopts |
| 26 |
- autounmask_write = ask or \ |
| 27 |
- self._frozen_config.myopts.get("--autounmask", "n") == True |
| 28 |
+ autounmask = self._frozen_config.myopts.get("--autounmask", "y") |
| 29 |
+ # Write if *either* --autounmask is explicitly *true*, *or* if |
| 30 |
+ # ask is *true* and --autounmask is *not* explicitly *false* |
| 31 |
+ autounmask_write = autounmask is True or \ |
| 32 |
+ (autounmask != 'n'and ask != False) |
| 33 |
autounmask_unrestricted_atoms = \ |
| 34 |
self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True |
| 35 |
quiet = "--quiet" in self._frozen_config.myopts |
| 36 |
-- |
| 37 |
1.8.5.5 |
Archives