diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-04-03 08:43:42 -0700 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-04-03 08:43:42 -0700 |
| commit | 29698e09d5bd2b3763e41dc707f423706a817ecd (patch) | |
| tree | fe16b035c2c3d91c2545846252525c9e388d3cd5 | |
| parent | 42180332c7c2d9a324c115e6e1dcfba982c537ac (diff) | |
| parent | 85faa0c42beb11f6e10cfa2d237b37b758f36e22 (diff) | |
| download | sos-29698e09d5bd2b3763e41dc707f423706a817ecd.tar.gz | |
Merge pull request #109 from battlemidget/patch-1
Fix super call to proper general plugin name
| -rw-r--r-- | sos/plugins/general.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 62c7e441..9979cfec 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -15,7 +15,7 @@ import os from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin -class general(Plugin): +class General(Plugin): """basic system information""" plugin_name = "general" @@ -57,7 +57,7 @@ class general(Plugin): self.addCmdOutput("/bin/ls -lR /var/lib") -class RedHatGeneral(general, RedHatPlugin): +class RedHatGeneral(General, RedHatPlugin): """Basic system information for RedHat based distributions""" def setup(self): @@ -90,22 +90,22 @@ class RedHatGeneral(general, RedHatPlugin): r"(\s*proxyPassword\s*=\s*)\S+", r"\1***") -class DebianGeneral(general, DebianPlugin, UbuntuPlugin): +class DebianGeneral(General, DebianPlugin): """Basic system information for Debian based distributions""" def setup(self): - super(GeneralDebian, self).setup() + super(DebianGeneral, self).setup() self.addCopySpecs([ "/etc/debian_version", "/etc/default", "/var/log/up2date", "/etc/lsb-release" ]) -class UbuntuGeneral(general, UbuntuPlugin): +class UbuntuGeneral(General, UbuntuPlugin): """Basic system information for Ubuntu based distributions""" def setup(self): - super(GeneralUbuntu, self).setup() + super(UbuntuGeneral, self).setup() self.addCopySpecs([ "/etc/os-release", "/var/log/ufw.log", |