Enable --autounmask by default

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2a6d1b150e832a13f738b3782778eac56ba347fd..1de147aebb8cdbd0e476d1dac7c879df242e233f 100644 (file)
--- 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 764031707cf8aec245c19bc89833e7ee63ce53d9..bc104415fc7940d7e28e3de58e06ba660d25a238 100644 (file)
--- 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 0689a37437f98684fe4c7388b18b0a4a935a9d8f..6ffdaaf593766be7667900d59afcf5aea7b29343 100644 (file)
--- 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 5132659276f2b7829cf9c303497be5b9a36c3c9a..204f3c92fea1b3b52f203fd49e2f16033a42f5dc 100644 (file)
--- 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 a4b905e698d594e537a6ba170e9a9ad300480409..34c6d45a0341968d2b063ed77ab7203998303711 100644 (file)
--- 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 57f1ff1841b634d82c2be94e37ee757aac3166e1..8aedf5999f81fb55e70448ae37e5a054ced8a2b8 100644 (file)
--- 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 b8d403db42a697824b0cff2877df181b4dd4046d..0bcfc4b70f09ba7a852fff39139666995be2ac21 100644 (file)
--- 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 1f428ef81920ff84374f6fd725fef643baed19c4..5839a39c3ca674fa84a9759a34b2406675281376 100644 (file)
--- 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,