aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stokes <hackr@cypherbook.com>2013-03-28 10:59:56 +0000
committerAdam Stokes <hackr@cypherbook.com>2013-03-28 10:59:56 +0000
commit85faa0c42beb11f6e10cfa2d237b37b758f36e22 (patch)
treee4c1cc10be4bd0636089282351bd9e782f97b22e
parent2fcb1f4a6fbf5abda746bf1470edb55ccc6b01a6 (diff)
downloadsos-85faa0c42beb11f6e10cfa2d237b37b758f36e22.tar.gz
Fix super call to proper general plugin name
We were calling super on incorrect plugin class. This was a result of the conforming name patch applied. Also went ahead and capitalized general plugin for pep8 spec. Signed-off-by: Adam Stokes <hackr@cypherbook.com>
-rw-r--r--sos/plugins/general.py12
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",