resolves bz434626 Wrong directory structure for translations

resolves bz436053 /usr/share/sos is not owned by any package 


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@551 ef72aa8b-4018-0410-8976-d6e080ef94d8

4 files changed, 9 insertions, 7 deletions

diff --git a/src/lib/sos/plugins/cs.py b/src/lib/sos/plugins/cs.py
index 871752dd..75803c0e 100644
--- a/src/lib/sos/plugins/cs.py
+++ b/src/lib/sos/plugins/cs.py
@@ -30,9 +30,10 @@ import os
 class cs(sos.plugintools.PluginBase):
     """Certificate System 7.x Diagnostic Information
     """
-    # check for default location of pki services (/var/lib.rhpki-*).  If default path exists, 
-    # assume rhpki- glob and grap all installed subsystems.  If customer has a custom install
-    # path, then ln -s the custom path to /var/lib/rhkpi-installed_subsystem (/var/lib/rhpki-ca, 
+    # check for default location of pki services (/var/lib.rhpki-*).  
+    # If default path exists, assume rhpki- glob and grap all installed 
+    # subsystems.  If customer has a custom install path, then ln -s the 
+    # custom path to /var/lib/rhkpi-installed_subsystem (/var/lib/rhpki-ca, 
     # /var/lib/rhpki-kra ect).
 
     def checkenabled(self):
diff --git a/src/lib/sos/plugins/ds.py b/src/lib/sos/plugins/ds.py
index f1de72ea..f80c7fe5 100644
--- a/src/lib/sos/plugins/ds.py
+++ b/src/lib/sos/plugins/ds.py
@@ -24,10 +24,12 @@ class ds(sos.plugintools.PluginBase):
     ds_version = None
 
     def checkenabled(self):
-        if self.cInfo["policy"].pkgByName("redhat-ds-base") or os.path.exists("/etc/dirsrv"):
+        if self.cInfo["policy"].pkgByName("redhat-ds-base") or \
+        os.path.exists("/etc/dirsrv"):
             self.ds_version = "ds8"
             return True
-        elif self.cInfo["policy"].pkgByName("redhat-ds-7") or os.path.exists("/opt/redhat-ds"):
+        elif self.cInfo["policy"].pkgByName("redhat-ds-7") or \
+        os.path.exists("/opt/redhat-ds"):
             self.ds_version = "ds7"
             return True
         return False
diff --git a/src/lib/sos/plugins/kernel.py b/src/lib/sos/plugins/kernel.py
index 669d8300..32ec59ce 100644
--- a/src/lib/sos/plugins/kernel.py
+++ b/src/lib/sos/plugins/kernel.py
@@ -71,7 +71,6 @@ class kernel(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/cmdline")
         self.addCopySpec("/proc/driver")
         self.addCopySpec("/proc/sys/kernel/tainted")
-        self.addCopySpec("/var/log/messages")
 
         return
 
diff --git a/src/lib/sos/plugins/rhn.py b/src/lib/sos/plugins/rhn.py
index 46ff2fbf..482aa143 100644
--- a/src/lib/sos/plugins/rhn.py
+++ b/src/lib/sos/plugins/rhn.py
@@ -47,7 +47,7 @@ class rhn(sos.plugintools.PluginBase):
         self.addCopySpec("/var/log/rhn*")	# rhn-logs
         self.addCopySpec("/var/log/rhn/rhn-database-installation.log")
 
-	# all these used to go in $DIR/mon-logs/
+        # all these used to go in $DIR/mon-logs/
         self.addCopySpec("/opt/notification/var/*.log*")
         self.addCopySpec("/var/tmp/ack_handler.log*")
         self.addCopySpec("/var/tmp/enqueue.log*")