From 85faa0c42beb11f6e10cfa2d237b37b758f36e22 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Thu, 28 Mar 2013 10:59:56 +0000 Subject: 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 --- sos/plugins/general.py | 12 ++++++------ 1 file 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", -- cgit