diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-13 18:12:10 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-13 18:12:10 +0000 |
| commit | 5ac2288861098a60eec18dfea1777236cdc42d32 (patch) | |
| tree | 825fe1f53ee2ebd962fabcbfad818759efeac337 | |
| parent | 2cf9a838c8655c6b50b6d041cd903b3474b4e060 (diff) | |
| download | sos-5ac2288861098a60eec18dfea1777236cdc42d32.tar.gz | |
Delete vestigial coloured output code
Colour output was removed from sos a long time ago. Kill off the
remaining opts variable, command line option and documentation
references for increased sanity.
| -rw-r--r-- | man/en/sosreport.1 | 8 | ||||
| -rw-r--r-- | sos/sosreport.py | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/man/en/sosreport.1 b/man/en/sosreport.1 index 48b388d0..e28e7581 100644 --- a/man/en/sosreport.1 +++ b/man/en/sosreport.1 @@ -9,9 +9,8 @@ sosreport \- Generate debugging information for this system [-o|--only-plugins plugin-names]\fR [-a|--alloptions] [-v|--verbose]\fR [--report] [--config-file conf] [--batch]\fR - [--build] [--name name] [--no-colors]\fR - [--ticket-number number] [--debug]\fR - [--upload] [--tmp-dir directory]\fR + [--build] [--name name] [--ticket-number number] + [--debug] [--upload] [--tmp-dir directory]\fR [--profile] [--help]\fR .SH DESCRIPTION \fBsosreport\fR generates a compressed tarball of debugging information @@ -67,9 +66,6 @@ Define a unique number for archive .B \--build Do not archive copied data, leave directory tree untouched for further modification .TP -.B \--no-colors -Disable colors written to console -.TP .B \--debug Give opportunity to debug python exceptions through the python debugger. .TP diff --git a/sos/sosreport.py b/sos/sosreport.py index 54478a01..6c0e8433 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -309,7 +309,6 @@ class SoSReport(object): def _setup_logging(self): if not sys.stdin.isatty(): - self.opts.nocolors = True self.opts.batch = True # main soslog @@ -571,7 +570,7 @@ class SoSReport(object): self.ui_log.info(_("The following plugin options are available:")) self.ui_log.info("") for (plug, plugname, optname, optparm) in self.all_options: - # format and colorize option value based on its type (int or bool) + # format option value based on its type (int or bool) if type(optparm["enabled"]) == bool: if optparm["enabled"] == True: tmpopt = "on" @@ -819,9 +818,6 @@ class SoSReport(object): parser.add_option("--batch", action="store_true", dest="batch", default=False, help="do not ask any question (batch mode)") - parser.add_option("--no-colors", action="store_true", - dest="nocolors", default=False, - help="do not use terminal colors for text") parser.add_option("-v", "--verbose", action="count", dest="verbosity", help="increase verbosity") |