diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2018-05-27 15:08:13 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-06-20 18:01:21 +0100 |
| commit | 691c51247ad2dd416dbe3d1807bfc2f9afd31d63 (patch) | |
| tree | 4e8ea3c203851c0dbff1a8d5128ebfdce84a3fd3 | |
| parent | 229bafd12a5c77fccd7f2306f389dddf8a814530 (diff) | |
| download | sos-691c51247ad2dd416dbe3d1807bfc2f9afd31d63.tar.gz | |
[sosreport] make --alloptions SoSOptions member match
For hysterical raisins --alloptions maps to cmd_args.usealloptions
rather than cmd_args.alloptions. Make the argument name and the
options member name match.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/__init__.py | 8 | ||||
| -rw-r--r-- | sos/sosreport.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sos/__init__.py b/sos/__init__.py index 543490ee..9526cd69 100644 --- a/sos/__init__.py +++ b/sos/__init__.py @@ -42,12 +42,12 @@ _sos = _default #: Names of all arguments _arg_names = [ - 'add_preset', 'all_logs', 'batch', 'build', 'case_id', 'chroot', - 'compression_type', 'config_file', 'desc', 'debug', 'del_preset', + 'add_preset', 'alloptions', 'all_logs', 'batch', 'build', 'case_id', + 'chroot', 'compression_type', 'config_file', 'desc', 'debug', 'del_preset', 'enableplugins', 'experimental', 'label', 'list_plugins', 'list_presets', 'list_profiles', 'log_size', 'noplugins', 'noreport', 'note', 'onlyplugins', 'plugopts', 'preset', 'profiles', 'quiet', 'sysroot', - 'tmp_dir', 'usealloptions', 'verbosity', 'verify' + 'tmp_dir', 'verbosity', 'verify' ] #: Arguments with non-zero default values @@ -61,6 +61,7 @@ _arg_defaults = { class SoSOptions(object): add_preset = "" + alloptions = False all_logs = False batch = False build = False @@ -89,7 +90,6 @@ class SoSOptions(object): sysroot = None threads = 4 tmp_dir = "" - usealloptions = False verbosity = 0 verify = False diff --git a/sos/sosreport.py b/sos/sosreport.py index 3bddea46..6b5f7dc8 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -215,7 +215,7 @@ def _parse_args(args): parser = ArgumentParser(usage=usage_string) parser.register('action', 'extend', SosListOption) parser.add_argument("-a", "--alloptions", action="store_true", - dest="usealloptions", default=False, + dest="alloptions", default=False, help="enable all options for loaded plugins") parser.add_argument("--all-logs", action="store_true", dest="all_logs", default=False, @@ -691,7 +691,7 @@ class SoSReport(object): self._exit(1) def _set_all_options(self): - if self.opts.usealloptions: + if self.opts.alloptions: for plugname, plug in self.loaded_plugins: for name, parms in zip(plug.opt_names, plug.opt_parms): if type(parms["enabled"]) == bool: |