From 887d7c8e179f4f011047e42b547cf46261fb10c0 Mon Sep 17 00:00:00 2001 From: Alexander Berntsen Date: Tue, 1 Oct 2013 11:40:55 +0200 Subject: [PATCH 1/3] emerge: Deprecate --autounmask Remove the --autounmask option from emerge. Please note that removing the option does not mean that the variable used for keeping track of autounmasking is not removed from depgraph.py. --- man/emerge.1 | 33 ++++++++++----------------------- pym/_emerge/depgraph.py | 3 +-- pym/_emerge/main.py | 9 --------- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index c59185f..58bdc94 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -322,38 +322,25 @@ invalid input. This helps prevent accidental acceptance of the first choice. This option is intended to be set in the \fBmake.conf\fR(5) \fBEMERGE_DEFAULT_OPTS\fR variable. -.TP -.BR "\-\-autounmask [ y | n ]" -Automatically unmask packages and generate package.use -settings as necessary to satisfy dependencies. This -option is enabled by default. If any configuration -changes are required, then they will be displayed -after the merge list and emerge will immediately -abort. If the displayed configuration changes are -satisfactory, you should copy and paste them into -the specified configuration file(s), or enable the \fB\-\-autounmask\-write\fR option. The \fBEMERGE_DEFAULT_OPTS\fR variable may be used to disable this option by default in \fBmake.conf\fR(5). .TP .BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]" -If \-\-autounmask is enabled, keyword and mask changes -using the \'=\' operator will be written. With this -option, \'>=\' operators will be used whenever possible. -USE and license changes always use the latter behavior. +Keyword and mask changes using the \'=\' operator will be written. With this +option, \'>=\' operators will be used whenever possible. USE and license +changes always use the latter behavior. .TP .BR "\-\-autounmask\-keep\-masks [ y | n ]" -If \-\-autounmask is enabled, no package.unmask or ** keyword changes -will be created. This leads to unsatisfied dependencies if -no other solution exists. +No package.unmask or ** keyword changes will be created if this is activated. +This leads to unsatisfied dependencies if no other solution exists. .TP .BR "\-\-autounmask\-write [ y | n ]" -If \-\-autounmask is enabled, changes are written -to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. -If the corresponding package.* is a file, the changes are appended to -it, if it is a directory, changes are written to the lexicographically -last file. This way it is always ensured that the new changes take -precedence over existing changes. +Write required unmask changes to the relevant config files, respecting +\fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. If the corresponding package.* is a +file, the changes are appended to it, if it is a directory, changes are written +to the lexicographically last file. This way it is always ensured that the new +changes take precedence over existing changes. .TP .BR \-\-backtrack=COUNT Specifies an integer number of times to backtrack if diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 7b77edc..9fdfa43 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -427,7 +427,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 = True self._success_without_autounmask = False self._traverse_ignored_deps = False self._complete_mode = False @@ -7971,7 +7971,6 @@ 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" mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, frozen_config=frozen_config, allow_backtracking=False) success, favorites = mydepgraph.select_files(myfiles) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 89413a9..fc73ef7 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -123,7 +123,6 @@ def insert_optional_args(args): default_arg_opts = { '--ask' : y_or_n, - '--autounmask' : y_or_n, '--autounmask-keep-masks': y_or_n, '--autounmask-unrestricted-atoms' : y_or_n, '--autounmask-write' : y_or_n, @@ -303,11 +302,6 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n }, - "--autounmask": { - "help" : "automatically unmask packages", - "choices" : true_y_or_n - }, - "--autounmask-unrestricted-atoms": { "help" : "write autounmask changes with >= atoms if possible", "choices" : true_y_or_n @@ -673,9 +667,6 @@ def parse_opts(tmpcmdline, silent=False): else: myoptions.ask = None - if myoptions.autounmask in true_y: - myoptions.autounmask = True - if myoptions.autounmask_unrestricted_atoms in true_y: myoptions.autounmask_unrestricted_atoms = True -- 1.8.1.5