[gentoo-portage-dev] [PATCH 4/4] emerge: Let --autounmask=n override other options

[Alexander Berntsen <bernalex@gentoo.org>]

From: Alexander Berntsen <alexander@plaimi.net>

Signed-off-by: Alexander Berntsen <bernalex@gentoo.org>
---
 pym/_emerge/depgraph.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index bfa63fa..37b3a54 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -418,7 +418,8 @@ class _dynamic_depgraph_config(object):
 		self._backtrack_infos = {}
 
 		self._buildpkgonly_deps_unsatisfied = False
-		self._autounmask = True
+		self._autounmask = \
+				depgraph._frozen_config.myopts.get("--autounmask") != 'n'
 		self._success_without_autounmask = False
 		self._traverse_ignored_deps = False
 		self._complete_mode = False
@@ -7333,8 +7334,11 @@ class depgraph(object):
 		"""
 
 		ask = "--ask" in self._frozen_config.myopts
-		autounmask_write = ask or \
-				self._frozen_config.myopts.get("--autounmask", "n") == True
+		autounmask = self._frozen_config.myopts.get("--autounmask", "y")
+		# Write if *either* --autounmask is explicitly *true*, *or* if
+		# ask is *true* and --autounmask is *not* explicitly *false*
+		autounmask_write = autounmask is True or \
+				(autounmask != 'n'and ask != False)
 		autounmask_unrestricted_atoms = \
 			self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True
 		quiet = "--quiet" in self._frozen_config.myopts
-- 
1.8.5.5