diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/_emerge/create_depgraph_params.py | 35 | ||||
| -rw-r--r-- | lib/_emerge/depgraph.py | 20 | ||||
| -rw-r--r-- | lib/_emerge/main.py | 10 | ||||
| -rw-r--r-- | lib/portage/tests/resolver/test_autounmask.py | 35 |
4 files changed, 91 insertions, 9 deletions
diff --git a/lib/_emerge/create_depgraph_params.py b/lib/_emerge/create_depgraph_params.py index 08605baa1..7d8da9065 100644 --- a/lib/_emerge/create_depgraph_params.py +++ b/lib/_emerge/create_depgraph_params.py @@ -7,6 +7,11 @@ from portage.util import writemsg_level def create_depgraph_params(myopts, myaction): #configure emerge engine parameters # + # autounmask: enable autounmask + # autounmask_keep_keywords: prevent autounmask changes to package.accept_keywords + # autounmask_keep_license: prevent autounmask changes to package.license + # autounmask_keep_masks: prevent autounmask changes to package.mask + # autounmask_keep_use: prevent autounmask changes to package.use # self: include _this_ package regardless of if it is merged. # selective: exclude the package if it is merged # recurse: go into the dependencies @@ -34,6 +39,36 @@ def create_depgraph_params(myopts, myaction): # binpkg_changed_deps: reject binary packages with outdated deps myparams = {"recurse" : True} + autounmask_keep_keywords = myopts.get("--autounmask-keep-keywords") + autounmask_keep_masks = myopts.get("--autounmask-keep-masks") + + autounmask = myopts.get("--autounmask") + autounmask_license = myopts.get('--autounmask-license') + autounmask_use = myopts.get('--autounmask-use') + if autounmask == 'n': + autounmask = False + else: + if autounmask is None: + if autounmask_use in (None, 'y'): + autounmask = True + elif autounmask_license in (None, 'y'): + autounmask = True + + # Do not enable package.accept_keywords or package.mask + # changes by default. + if autounmask_keep_keywords is None: + autounmask_keep_keywords = True + if autounmask_keep_masks is None: + autounmask_keep_masks = True + else: + autounmask = True + + myparams['autounmask'] = autounmask + myparams['autounmask_keep_use'] = True if autounmask_use == 'n' else False + myparams['autounmask_keep_license'] = True if autounmask_license == 'n' else False + myparams['autounmask_keep_keywords'] = False if autounmask_keep_keywords in (None, 'n') else True + myparams['autounmask_keep_masks'] = False if autounmask_keep_masks in (None, 'n') else True + bdeps = myopts.get("--with-bdeps") if bdeps is not None: myparams["bdeps"] = bdeps diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 51614fc14..a641bfc21 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -495,7 +495,7 @@ class _dynamic_depgraph_config(object): self._backtrack_infos = {} self._buildpkgonly_deps_unsatisfied = False - self._autounmask = depgraph._frozen_config.myopts.get('--autounmask') != 'n' + self._autounmask = self.myparams['autounmask'] self._displayed_autounmask = False self._success_without_autounmask = False self._autounmask_backtrack_disabled = False @@ -5907,15 +5907,19 @@ class depgraph(object): if self._dynamic_config._autounmask is not True: return - autounmask_keep_keywords = self._frozen_config.myopts.get("--autounmask-keep-keywords", "n") != "n" - autounmask_keep_masks = self._frozen_config.myopts.get("--autounmask-keep-masks", "n") != "n" + autounmask_keep_keywords = self._dynamic_config.myparams['autounmask_keep_keywords'] + autounmask_keep_license = self._dynamic_config.myparams['autounmask_keep_license'] + autounmask_keep_masks = self._dynamic_config.myparams['autounmask_keep_masks'] + autounmask_keep_use = self._dynamic_config.myparams['autounmask_keep_use'] autounmask_level = self._AutounmaskLevel() - autounmask_level.allow_use_changes = True - yield autounmask_level + if not autounmask_keep_use: + autounmask_level.allow_use_changes = True + yield autounmask_level - autounmask_level.allow_license_changes = True - yield autounmask_level + if not autounmask_keep_license: + autounmask_level.allow_license_changes = True + yield autounmask_level if not autounmask_keep_keywords: autounmask_level.allow_unstable_keywords = True @@ -9835,7 +9839,7 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp "\n\nautounmask breakage detected\n\n", noiselevel=-1, level=logging.DEBUG) mydepgraph.display_problems() - myopts["--autounmask"] = "n" + myparams["autounmask"] = False mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, frozen_config=frozen_config, allow_backtracking=False) success, favorites = mydepgraph.select_files(myfiles) diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py index e8b2c2e13..486664c84 100644 --- a/lib/_emerge/main.py +++ b/lib/_emerge/main.py @@ -347,11 +347,21 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n }, + "--autounmask-license": { + "help" : "allow autounmask to change package.license", + "choices" : y_or_n + }, + "--autounmask-unrestricted-atoms": { "help" : "write autounmask changes with >= atoms if possible", "choices" : true_y_or_n }, + "--autounmask-use": { + "help" : "allow autounmask to change package.use", + "choices" : y_or_n + }, + "--autounmask-keep-keywords": { "help" : "don't add package.accept_keywords entries", "choices" : true_y_or_n diff --git a/lib/portage/tests/resolver/test_autounmask.py b/lib/portage/tests/resolver/test_autounmask.py index 64718dbf9..a3bf0ff94 100644 --- a/lib/portage/tests/resolver/test_autounmask.py +++ b/lib/portage/tests/resolver/test_autounmask.py @@ -93,6 +93,26 @@ class AutounmaskTestCase(TestCase): mergelist=["dev-libs/C-1", "dev-libs/B-1", "dev-libs/A-1"], use_changes={ "dev-libs/B-1": {"foo": True} }), + ResolverPlaygroundTestCase( + ["dev-libs/A:1"], + options={"--autounmask-use": "y"}, + success=False, + mergelist=["dev-libs/C-1", "dev-libs/B-1", "dev-libs/A-1"], + use_changes={ "dev-libs/B-1": {"foo": True} }), + + # Test default --autounmask-use + ResolverPlaygroundTestCase( + ["dev-libs/A:1"], + success=False, + mergelist=["dev-libs/C-1", "dev-libs/B-1", "dev-libs/A-1"], + use_changes={ "dev-libs/B-1": {"foo": True} }), + + # Explicitly disable --autounmask-use + ResolverPlaygroundTestCase( + ["dev-libs/A:1"], + success=False, + options={"--autounmask-use": "n"}), + #Make sure we restart if needed. ResolverPlaygroundTestCase( ["dev-libs/A:1", "dev-libs/B"], @@ -408,17 +428,30 @@ class AutounmaskTestCase(TestCase): } test_cases = ( + # --autounmask=n negates default --autounmask-license ResolverPlaygroundTestCase( ["=dev-libs/A-1"], options={"--autounmask": 'n'}, success=False), ResolverPlaygroundTestCase( ["=dev-libs/A-1"], - options={"--autounmask": True}, + options={"--autounmask-license": "y"}, success=False, mergelist=["dev-libs/A-1"], license_changes={ "dev-libs/A-1": set(["TEST"]) }), + # Test default --autounmask-license + ResolverPlaygroundTestCase( + ["=dev-libs/A-1"], + success=False, + mergelist=["dev-libs/A-1"], + license_changes={ "dev-libs/A-1": set(["TEST"]) }), + + ResolverPlaygroundTestCase( + ["=dev-libs/A-1"], + options={"--autounmask-license": "n"}, + success=False), + #Test license+keyword+use change at once. ResolverPlaygroundTestCase( ["=dev-libs/C-1"], |