--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 91ec7599e17c3255be5c218f5b8f994e28b2ccb0..fabc2df10a814ef8a3d2bda6f0dbfdd4ef432f13 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3094,7 +3094,11 @@ class depgraph(object):
                        if required_use and check_required_use(required_use, old_use, pkg.iuse.is_valid_flag) and \
                                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)
                        if want_restart_for_use_change(pkg, new_use):
                                self._dynamic_config._need_restart = True

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 709adfa6b2625d4857958ba711de7d239055dfa6..1c5d974734bf96093f464ade86a7c7f8083be428 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 4100fbdcf7f75bff00e0badc2796c5684bbd14df..124abe14ee48c14d4f66a68b9ea0c675e547133f 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)