From eefc895b1cbfcb347d2f35828e92e606bf8dc457 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Thu, 10 Apr 2014 16:11:07 +0100
Subject: Really fix file and command collection regressions

Previous patch was missing the hunks for plugins other than
usb:

       modified:   sos/plugins/general.py
       modified:   sos/plugins/logs.py
       modified:   sos/plugins/networking.py
       modified:   sos/plugins/qpid.py
       modified:   sos/plugins/s390.py

The automation used to convert to add_copy_specs() and
add_cmd_outputs() left a few missing and stray commas in file
and command lists, for e.g. causing two lsusb commands to be
concatenated:

  Running 71/74: usb...
[plugin:usb] collecting path '/sys/bus/usb'
[plugin:usb] collecting output of 'lsusblsusb -v'
[plugin:usb] collecting output of 'lsusb -t'

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/general.py    | 6 +++---
 sos/plugins/logs.py       | 4 ++--
 sos/plugins/networking.py | 2 +-
 sos/plugins/qpid.py       | 2 +-
 sos/plugins/s390.py       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 7e6f78c7..f8e228fa 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -53,7 +53,7 @@ class RedHatGeneral(General, RedHatPlugin):
 
         self.add_copy_specs([
             "/etc/redhat-release",
-            "/etc/fedora-release",
+            "/etc/fedora-release"
         ])
 
 
@@ -69,8 +69,8 @@ class DebianGeneral(General, DebianPlugin):
         super(DebianGeneral, self).setup()
         self.add_copy_specs([
             "/etc/default",
-            "/etc/lsb-release"
-            "/etc/debian_version",
+            "/etc/lsb-release",
+            "/etc/debian_version"
         ])
 
 
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index bd87e9d5..9a6fb4ae 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -72,9 +72,9 @@ class DebianLogs(Logs, DebianPlugin, UbuntuPlugin):
             "/var/log/mail*",
             "/var/log/dist-upgrade",
             "/var/log/installer",
-            "/var/log/unattended-upgrades"
+            "/var/log/unattended-upgrades",
             "/var/log/apport.log",
-            "/var/log/landscape",
+            "/var/log/landscape"
         ])
 
 
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index 952dcfd9..5d3c6532 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -78,7 +78,7 @@ class Networking(Plugin):
             "/etc/xinetd.conf",
             "/etc/xinetd.d",
             "/etc/host*",
-            "/etc/resolv.conf"
+            "/etc/resolv.conf",
             "/etc/network*",
             "/etc/NetworkManager/NetworkManager.conf",
             "/etc/NetworkManager/system-connections",
diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py
index 306dac1a..f51e3359 100644
--- a/sos/plugins/qpid.py
+++ b/sos/plugins/qpid.py
@@ -41,7 +41,7 @@ class Qpid(Plugin, RedHatPlugin):
             "/var/lib/qpid/syslog",
             "/etc/ais/openais.conf",
             "/var/log/cumin.log",
-            "/var/log/mint.log"
+            "/var/log/mint.log",
             "/etc/sasl2/qpidd.conf",
             "/etc/qpid/qpidc.conf",
             "/etc/sesame/sesame.conf",
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index d4aa0fc9..965c2463 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -31,7 +31,7 @@ class S390(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_copy_specs([
-            "/proc/cio_ignore"
+            "/proc/cio_ignore",
             "/proc/crypto",
             "/proc/dasd/devices",
             "/proc/dasd/statistics",
-- 
cgit