Enable --autounmask by default

8 files changed, 13 insertions, 6 deletions

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2a6d1b150..1de147aeb 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -424,7 +424,7 @@ class _dynamic_depgraph_config(object):
 		self._skip_restart = False
 		self._backtrack_infos = {}
 
-		self._autounmask = depgraph._frozen_config.myopts.get('--autounmask', 'n') == True
+		self._autounmask = depgraph._frozen_config.myopts.get('--autounmask') != 'n'
 		self._success_without_autounmask = False
 		self._traverse_ignored_deps = False
 
@@ -3317,7 +3317,7 @@ class depgraph(object):
 		if pkg.visible:
 			return True
 
-		if self._frozen_config.myopts.get('--autounmask', 'n') is not True:
+		if not self._dynamic_config._autounmask:
 			return False
 
 		pkgsettings = self._frozen_config.pkgsettings[pkg.root]
diff --git a/pym/portage/tests/ebuild/test_config.py b/pym/portage/tests/ebuild/test_config.py
index 764031707..bc104415f 100644
--- a/pym/portage/tests/ebuild/test_config.py
+++ b/pym/portage/tests/ebuild/test_config.py
@@ -168,6 +168,7 @@ class ConfigTestCase(TestCase):
 		test_cases = (
 				ResolverPlaygroundTestCase(
 					["dev-libs/A"],
+					options = { "--autounmask": 'n' },
 					success = False),
 				ResolverPlaygroundTestCase(
 					["dev-libs/B"],
@@ -183,6 +184,7 @@ class ConfigTestCase(TestCase):
 					mergelist = ["dev-libs/D-1"]),
 				ResolverPlaygroundTestCase(
 					["dev-libs/E"],
+					options = { "--autounmask": 'n' },
 					success = False),
 		)
 
diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index 0689a3743..6ffdaaf59 100644
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -281,7 +281,7 @@ class AutounmaskTestCase(TestCase):
 		test_cases = (
 				ResolverPlaygroundTestCase(
 					["=dev-libs/A-1"],
-					options = {"--autounmask": False},
+					options = {"--autounmask": 'n'},
 					success = False),
 				ResolverPlaygroundTestCase(
 					["=dev-libs/A-1"],
diff --git a/pym/portage/tests/resolver/test_circular_dependencies.py b/pym/portage/tests/resolver/test_circular_dependencies.py
index 513265927..204f3c92f 100644
--- a/pym/portage/tests/resolver/test_circular_dependencies.py
+++ b/pym/portage/tests/resolver/test_circular_dependencies.py
@@ -60,7 +60,6 @@ class CircularDependencyTestCase(TestCase):
 			#Conflict with autounmask
 			ResolverPlaygroundTestCase(
 				["=dev-libs/W-3"],
-				options = { "--autounmask": True },
 				circular_dependency_solutions = { "dev-libs/Y-1": frozenset([frozenset([("foo", False)])])},
 				use_changes = { "dev-libs/Z-3": {"bar": True}},
 				success = False),
diff --git a/pym/portage/tests/resolver/test_multirepo.py b/pym/portage/tests/resolver/test_multirepo.py
index a4b905e69..34c6d45a0 100644
--- a/pym/portage/tests/resolver/test_multirepo.py
+++ b/pym/portage/tests/resolver/test_multirepo.py
@@ -248,6 +248,7 @@ class MultirepoTestCase(TestCase):
 				mergelist = ["dev-libs/A-2::repo1", "dev-libs/B-2"]),
 			ResolverPlaygroundTestCase(
 				["=dev-libs/B-3"],
+				options = { "--autounmask": 'n' },
 				success = False,
 				check_repo_names = True),
 
@@ -297,11 +298,13 @@ class MultirepoTestCase(TestCase):
 				mergelist = ["dev-libs/G-1"]),
 			ResolverPlaygroundTestCase(
 				["dev-libs/H"],
+				options = { "--autounmask": 'n' },
 				success = False),
 
 			#package.mask with wildcards
 			ResolverPlaygroundTestCase(
 				["dev-libs/Z"],
+				options = { "--autounmask": 'n' },
 				success = False),
 			)
 
diff --git a/pym/portage/tests/resolver/test_old_dep_chain_display.py b/pym/portage/tests/resolver/test_old_dep_chain_display.py
index 57f1ff184..8aedf5999 100644
--- a/pym/portage/tests/resolver/test_old_dep_chain_display.py
+++ b/pym/portage/tests/resolver/test_old_dep_chain_display.py
@@ -18,9 +18,11 @@ class OldDepChainDisplayTestCase(TestCase):
 		test_cases = (
 			ResolverPlaygroundTestCase(
 				["=dev-libs/A-1"],
+				options = { "--autounmask": 'n' },
 				success = False),
 			ResolverPlaygroundTestCase(
 				["=dev-libs/A-2"],
+				options = { "--autounmask": 'n' },
 				success = False),
 			)
 
diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py
index b8d403db4..0bcfc4b70 100644
--- a/pym/portage/tests/resolver/test_simple.py
+++ b/pym/portage/tests/resolver/test_simple.py
@@ -24,7 +24,7 @@ class SimpleResolverTestCase(TestCase):
 
 		test_cases = (
 			ResolverPlaygroundTestCase(["dev-libs/A"], success = True, mergelist = ["dev-libs/A-1"]),
-			ResolverPlaygroundTestCase(["=dev-libs/A-2"], success = False),
+			ResolverPlaygroundTestCase(["=dev-libs/A-2"], options = { "--autounmask": 'n' }, success = False),
 
 			ResolverPlaygroundTestCase(
 				["dev-libs/A"],
diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/pym/portage/tests/resolver/test_slot_collisions.py
index 1f428ef81..5839a39c3 100644
--- a/pym/portage/tests/resolver/test_slot_collisions.py
+++ b/pym/portage/tests/resolver/test_slot_collisions.py
@@ -56,6 +56,7 @@ class SlotCollisionTestCase(TestCase):
 			#A qt-*[qt3support] like mess.
 			ResolverPlaygroundTestCase(
 				["dev-libs/A", "dev-libs/B", "dev-libs/C", "dev-libs/D"],
+				options = { "--autounmask": 'n' },
 				success = False,
 				mergelist = ["dev-libs/A-1", "dev-libs/B-1", "dev-libs/C-1", "dev-libs/D-1"],
 				ignore_mergelist_order = True,
@@ -98,7 +99,7 @@ class SlotCollisionTestCase(TestCase):
 			ResolverPlaygroundTestCase(
 				["sci-libs/P", "sci-libs/Q:2"],
 				success = False,
-				options = { "--update": True, "--complete-graph": True },
+				options = { "--update": True, "--complete-graph": True, "--autounmask": 'n' },
 				mergelist = ["sci-libs/P-1", "sci-libs/Q-1"],
 				ignore_mergelist_order = True,
 				all_permutations=True,