diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2018-06-20 17:00:08 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-06-20 18:01:21 +0100 |
| commit | 1f0eee146650eabc1b5317255f99b61794731fe4 (patch) | |
| tree | e3c19532e67fd5f300e0df38ee76f379865f1e42 | |
| parent | 3e2744da3f74e51d40b538081fc3636aa77ae8b9 (diff) | |
| download | sos-1f0eee146650eabc1b5317255f99b61794731fe4.tar.gz | |
[sosreport] make -v/--verbosity use _arg_defaults
Since the default for --verbosity must be set (to make it 0 rather
than None), use the _arg_defaults[] dictionary since the value is
not the default for the corresponding ArgumentParser action.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/__init__.py | 7 | ||||
| -rw-r--r-- | sos/sosreport.py | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sos/__init__.py b/sos/__init__.py index a299ea17..0b243f9c 100644 --- a/sos/__init__.py +++ b/sos/__init__.py @@ -53,10 +53,13 @@ _arg_names = [ #: Arguments with non-zero default values _arg_defaults = { - "log_size": 10, "chroot": "auto", "compression_type": "auto", - "preset": "auto" + "log_size": 10, + "preset": "auto", + # Verbosity has an explicit zero default since the ArgumentParser + # count action default is None. + "verbosity": 0 } diff --git a/sos/sosreport.py b/sos/sosreport.py index 4f0537a2..f47918fe 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -295,8 +295,9 @@ def _parse_args(args): dest="tmp_dir", help="specify alternate temporary directory", default=None) - parser.add_argument("-v", "--verbose", action="count", default=0, - dest="verbosity", help="increase verbosity") + parser.add_argument("-v", "--verbose", action="count", dest="verbosity", + default=_arg_defaults["verbosity"], + help="increase verbosity"), parser.add_argument("--verify", action="store_true", dest="verify", default=False, help="perform data verification during collection") |