--autounmask: Don't change masked/forced flags

This will fix bug #364701.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 391c845de1b699c7944bb17afccbff1df8e2c011..a0a4622eeb67fc5f7bdc278854322548ed2c980b 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3120,6 +3120,10 @@ class depgraph(object):
                                not check_required_use(required_use, new_use, pkg.iuse.is_valid_flag):
                                return old_use
 
+                       if pkg.use.mask.intersection(new_changes) or \
+                               pkg.use.force.intersection(new_changes):
+                               return old_use
+
                        self._dynamic_config._needed_use_config_changes[pkg] = (new_use, new_changes)
                        backtrack_infos = self._dynamic_config._backtrack_infos
                        backtrack_infos.setdefault("config", {})

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index eb591bba5002ca13f40d29a4ed30f3f2a2bcf805..276b193b88b7e0da7188ccdced565938cb41efb8 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -32,7 +32,7 @@ class ResolverPlayground(object):
        """
 
        config_files = frozenset(("package.use", "package.mask", "package.keywords", \
-               "package.unmask", "package.properties", "package.license"))
+               "package.unmask", "package.properties", "package.license", "use.mask", "use.force"))
 
        def __init__(self, ebuilds={}, installed={}, profile={}, repo_configs={}, \
                user_config={}, sets={}, world=[], debug=False):

diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index 9e50be7ed94d8a622b9e9e839f017ec05240df0e..bd3a5f99ea93b0923b774d2aa37e8e6faee47450 100644 (file)
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -16,6 +16,12 @@ class AutounmaskTestCase(TestCase):
                        "dev-libs/C-1": {},
                        "dev-libs/D-1": {},
 
+                       #ebuilds to test if we allow changing of masked or forced flags
+                       "dev-libs/E-1": { "SLOT": 1, "DEPEND": "dev-libs/F[masked-flag]", "EAPI": 2},
+                       "dev-libs/E-2": { "SLOT": 2, "DEPEND": "dev-libs/G[-forced-flag]", "EAPI": 2},
+                       "dev-libs/F-1": { "IUSE": "masked-flag"},
+                       "dev-libs/G-1": { "IUSE": "forced-flag"},
+
                        #ebuilds to test keyword changes
                        "app-misc/Z-1": { "KEYWORDS": "~x86", "DEPEND": "app-misc/Y" },
                        "app-misc/Y-1": { "KEYWORDS": "~x86" },
@@ -185,9 +191,32 @@ class AutounmaskTestCase(TestCase):
                                        options = { "--autounmask": True },
                                        use_changes = None,
                                        success = False),
+
+                               #Make sure we don't change masked/forced flags.
+                               ResolverPlaygroundTestCase(
+                                       ["dev-libs/E:1"],
+                                       options = {"--autounmask": True},
+                                       use_changes = None,
+                                       success = False),
+                               ResolverPlaygroundTestCase(
+                                       ["dev-libs/E:2"],
+                                       options = {"--autounmask": True},
+                                       use_changes = None,
+                                       success = False),
                        )
 
-               playground = ResolverPlayground(ebuilds=ebuilds)
+               profile = {
+                       "use.mask":
+                               (
+                                       "masked-flag",
+                               ),
+                       "use.force":
+                               (
+                                       "forced-flag",
+                               ),
+               }
+
+               playground = ResolverPlayground(ebuilds=ebuilds, profile=profile)
                try:
                        for test_case in test_cases:
                                playground.run_TestCase(test_case)