Merge pull request #136 from karibou/master

Minor fixes and reformat

4 files changed, 7 insertions, 6 deletions

diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index c31dea70..9861281f 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -60,10 +60,10 @@ class Landscape(Plugin, UbuntuPlugin):
     packages = ('landscape-client',)
 
     def setup(self):
-        self.addCopySpec("/etc/landscape/client.conf")
+        self.add_copy_spec("/etc/landscape/client.conf")
         
     def postproc(self):
-        self.doFileSub("/etc/landscape/client.conf", 
+        self.do_file_sub("/etc/landscape/client.conf", 
         r"registration_password(.*)", 
         r"registration_password[***]"
         )
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index 3fce4278..0c1dc622 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -61,6 +61,5 @@ class DebianLdap(Ldap, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianLdap, self).setup()
 
-    def setup(self):
         self.add_copy_specs(["/etc/ldap/ldap.conf", "/etc/ldap/slapd.d"])
 
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 8a347f8e..a3f6b003 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -13,7 +13,9 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from os.path import exists, join, normpath
 import commands
+import pdb
 
 class Named(Plugin):
     """named related information
@@ -24,7 +26,7 @@ class Named(Plugin):
     config_files = named_conf
 
     def setup(self):
-        for cfg in config_files:
+        for cfg in self.config_files:
             if exists(cfg):
                 self.add_copy_spec(cfg)
                 self.add_copy_spec(self.get_dns_dir(cfg))
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index a7e07a80..90b740ca 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -116,7 +116,7 @@ class Networking(Plugin):
                     self.add_cmd_output("brctl showstp "+br_name)
 
         if self.get_option("traceroute"):
-            self.add_cmd_output("/bin/traceroute -n %s" % trace_host)
+            self.add_cmd_output("/bin/traceroute -n %s" % self.trace_host)
 
         return
 
@@ -148,5 +148,5 @@ class UbuntuNetworking(Networking, UbuntuPlugin):
         self.add_cmd_output("/usr/sbin/ufw status")
         self.add_cmd_output("/usr/sbin/ufw app list")
         if self.get_option("traceroute"):
-            self.add_cmd_output("/usr/sbin/traceroute -n %s" % trace_host)
+            self.add_cmd_output("/usr/sbin/traceroute -n %s" % self.trace_host)