From c903157056c629589428ee167eda50bbd93e97da Mon Sep 17 00:00:00 2001
From: Jesse Jaggars <jjaggars@redhat.com>
Date: Fri, 2 Mar 2012 13:47:17 -0600
Subject: plugins were being activated due to one-tuple definition issues

---
 sos/plugins/__init__.py    | 28 +++++++++++++---------------
 sos/plugins/amd.py         |  4 ++--
 sos/plugins/anaconda.py    |  2 +-
 sos/plugins/autofs.py      |  4 ++--
 sos/plugins/cobbler.py     |  2 +-
 sos/plugins/corosync.py    |  4 ++--
 sos/plugins/dhcp.py        |  4 ++--
 sos/plugins/ftp.py         |  4 ++--
 sos/plugins/gluster.py     |  2 +-
 sos/plugins/ipa.py         |  4 ++--
 sos/plugins/ipsec.py       |  4 ++--
 sos/plugins/iscsitarget.py |  2 +-
 sos/plugins/kdump.py       |  4 ++--
 sos/plugins/kernel_rt.py   |  2 +-
 sos/plugins/ldap.py        |  4 ++--
 sos/plugins/mysql.py       |  2 +-
 sos/plugins/named.py       |  2 +-
 sos/plugins/netdump.py     |  4 ++--
 sos/plugins/nis.py         |  2 +-
 sos/plugins/nscd.py        |  4 ++--
 sos/plugins/oddjob.py      |  4 ++--
 sos/plugins/openssl.py     |  4 ++--
 sos/plugins/openswan.py    |  4 ++--
 sos/plugins/postfix.py     |  4 ++--
 sos/plugins/ppp.py         |  4 ++--
 sos/plugins/pxe.py         |  4 ++--
 sos/plugins/quagga.py      |  4 ++--
 sos/plugins/radius.py      |  4 ++--
 sos/plugins/sendmail.py    |  4 ++--
 sos/plugins/smartcard.py   |  4 ++--
 sos/plugins/snmp.py        |  4 ++--
 sos/plugins/squid.py       |  4 ++--
 sos/plugins/sssd.py        |  2 +-
 sos/plugins/systemtap.py   |  2 +-
 sos/plugins/tftpserver.py  |  4 ++--
 sos/plugins/tomcat.py      |  2 +-
 sos/plugins/udhcp.py       |  4 ++--
 sos/plugins/vmware.py      |  2 +-
 sos/plugins/x11.py         |  2 +-
 sos/plugins/xinetd.py      |  4 ++--
 sos/plugins/yum.py         |  4 ++--
 sos/policies/redhat.py     |  8 ++++----
 42 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
index a40f26a4..436591d1 100644
--- a/sos/plugins/__init__.py
+++ b/sos/plugins/__init__.py
@@ -37,7 +37,6 @@ import shutil
 from stat import *
 from time import time
 from itertools import *
-from collections import deque
 import logging
 import urllib2
 
@@ -88,26 +87,25 @@ class Plugin(object):
 
     requires_root = True
     version = 'unversioned'
+    packages = ()
+    files = ()
 
     def __init__(self, commons):
         if not getattr(self, "optionList", False):
-            self.optionList = deque()
+            self.optionList = []
 
-        self.copiedFiles = deque()
-        self.executedCommands = deque()
-        self.diagnose_msgs = deque()
-        self.alerts = deque()
+        self.copiedFiles = []
+        self.executedCommands = []
+        self.diagnose_msgs = []
+        self.alerts = []
         self.customText = ""
-        self.optNames = deque()
-        self.optParms = deque()
+        self.optNames = []
+        self.optParms = []
         self.cInfo = commons
-        self.forbiddenPaths = deque()
-        self.copyPaths = deque()
-        self.copyStrings = deque()
-        self.collectProgs = deque()
-
-        self.packages = deque()
-        self.files = deque()
+        self.forbiddenPaths = []
+        self.copyPaths = []
+        self.copyStrings = []
+        self.collectProgs = []
 
         self.must_exit = False
 
diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py
index a682b5ec..08078694 100644
--- a/sos/plugins/amd.py
+++ b/sos/plugins/amd.py
@@ -19,8 +19,8 @@ from sos.plugins import Plugin, RedHatPlugin
 class amd(Plugin, RedHatPlugin):
     """Amd automounter information
     """
-    files = ('/etc/rc.d/init.d/amd')
-    packages = ('am-utils')
+    files = ('/etc/rc.d/init.d/amd',)
+    packages = ('am-utils',)
 
     def setup(self):
         self.addCopySpecs("/etc/amd.*")
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index 6fef6ec3..b37db44d 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -18,7 +18,7 @@ class anaconda(Plugin, RedHatPlugin):
     """Anaconda / Installation information
     """
 
-    files = ('/var/log/anaconda.log')
+    files = ('/var/log/anaconda.log',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index fcf0eaa8..dc7c653d 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -21,8 +21,8 @@ class autofs(Plugin, RedHatPlugin):
     """autofs server-related information
     """
 
-    files = ('/etc/sysconfig/autofs')
-    packages = ('autofs')
+    files = ('/etc/sysconfig/autofs',)
+    packages = ('autofs',)
 
     def checkdebug(self):
         """ testing if autofs debug has been enabled anywhere
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index c4fc1a74..183d11fd 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -18,7 +18,7 @@ class cobbler(Plugin, RedHatPlugin):
     """cobbler related information
     """
 
-    packages = ('cobbler')
+    packages = ('cobbler',)
 
     def setup(self):
         self.addCopySpec("/etc/cobbler")
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py
index 500e4176..87f764ca 100644
--- a/sos/plugins/corosync.py
+++ b/sos/plugins/corosync.py
@@ -18,8 +18,8 @@ class corosync(Plugin, RedHatPlugin):
     """ corosync information
     """
 
-    files = ('/usr/bin/corosync')
-    packages = ('corosync')
+    files = ('/usr/bin/corosync',)
+    packages = ('corosync',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index d3e7690f..e43e0c3d 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -18,8 +18,8 @@ class dhcp(Plugin, RedHatPlugin):
     """DHCP related information
     """
 
-    files = ('/etc/rc.d/init.d/dhcpd')
-    packages = ('dhcp')
+    files = ('/etc/rc.d/init.d/dhcpd',)
+    packages = ('dhcp',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/ftp.py b/sos/plugins/ftp.py
index ef8b674c..61fbfb00 100644
--- a/sos/plugins/ftp.py
+++ b/sos/plugins/ftp.py
@@ -19,8 +19,8 @@ class ftp(Plugin, RedHatPlugin):
     """FTP server related information
     """
 
-    files = ('/etc/vsftpd')
-    packages = ('vsftpd')
+    files = ('/etc/vsftpd',)
+    packages = ('vsftpd',)
 
     def setup(self):
         self.addCopySpec("/etc/ftp*")
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index 174baacf..ef55b7df 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -18,7 +18,7 @@ from sos.plugins import Plugin, RedHatPlugin
 class gluster(Plugin, RedHatPlugin):
     '''gluster related information'''
 
-    files = ('/etc/glusterd')
+    files = ('/etc/glusterd',)
 
     def setup(self):
         self.addForbiddenPath("/etc/glusterd/geo-replication/secret.pem")
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index 8ffc245a..9678c10d 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -23,8 +23,8 @@ class ipa(Plugin, RedHatPlugin):
     # ntp and dirserver stuff are covered in existing sos plugins, so we really only
     # need to get kerberos and ipa specific addons.
 
-    files = ('/etc/ipa')
-    packages = ('ipa-server')
+    files = ('/etc/ipa',)
+    packages = ('ipa-server',)
 
     def setup(self):
         self.addCopySpec("/etc/dirsrv/ds.keytab")
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index b9526e9b..994b8f1b 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -21,8 +21,8 @@ class ipsec(Plugin, RedHatPlugin):
     """ipsec related information
     """
 
-    files = ('/etc/racoon/racoon.conf')
-    packages = ('ipsec-tools')
+    files = ('/etc/racoon/racoon.conf',)
+    packages = ('ipsec-tools',)
 
     def setup(self):
         self.addCopySpec("/etc/racoon")
diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py
index 841d81f2..0c787751 100644
--- a/sos/plugins/iscsitarget.py
+++ b/sos/plugins/iscsitarget.py
@@ -20,7 +20,7 @@ class iscsitarget(Plugin, RedHatPlugin):
     """iscsi-target related information
     """
 
-    packages = ('scsi-target-utils')
+    packages = ('scsi-target-utils',)
 
     def setup(self):
         self.addCopySpec("/etc/tgt/targets.conf")
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index e624645e..56c0b9ab 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -19,8 +19,8 @@ class kdump(Plugin, RedHatPlugin):
     """Kdump related information
     """
 
-    files = ('/etc/kdump.conf')
-    packages = ('kexec-tools')
+    files = ('/etc/kdump.conf',)
+    packages = ('kexec-tools',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/kernel_rt.py b/sos/plugins/kernel_rt.py
index 23dad730..10f8e57e 100644
--- a/sos/plugins/kernel_rt.py
+++ b/sos/plugins/kernel_rt.py
@@ -22,7 +22,7 @@ class kernel_rt(RedHatPlugin):
 
     # this file exists only when the realtime kernel is booted
     # this plugin will not be called is this file does not exist
-    files = ('/sys/kernel/realtime')
+    files = ('/sys/kernel/realtime',)
 
     def setup(self):
         self.addCopySpec('/etc/rtgroups')
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index fbf3af80..3a08ef34 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -19,8 +19,8 @@ class ldap(Plugin, RedHatPlugin):
     """LDAP related information
     """
 
-    files = ('/etc/openldap/ldap.conf')
-    packages = ('openldap')
+    files = ('/etc/openldap/ldap.conf',)
+    packages = ('openldap',)
 
     def get_ldap_opts(self):
         # capture /etc/openldap/ldap.conf options in dict
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index 019839fa..a2086347 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -19,7 +19,7 @@ class mysql(Plugin, RedHatPlugin):
     """MySQL related information
     """
 
-    files = ('/etc/my.cnf')
+    files = ('/etc/my.cnf',)
     packages = ('mysql-server', 'mysql')
 
     def setup(self):
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 3656d5b7..82c4a9cc 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -21,7 +21,7 @@ class named(Plugin, RedHatPlugin):
     """
 
     files = ('/etc/named.conf', '/etc/sysconfig/named')
-    packages = ('bind')
+    packages = ('bind',)
 
     def getDnsDir(self, configFile):
         """ grab directory path from named{conf,boot}
diff --git a/sos/plugins/netdump.py b/sos/plugins/netdump.py
index 1fa2cbb1..914e0b5f 100644
--- a/sos/plugins/netdump.py
+++ b/sos/plugins/netdump.py
@@ -19,8 +19,8 @@ class netdump(Plugin, RedHatPlugin):
     """Netdump Configuration Information
     """
 
-    files = ('/etc/sysconfig/netdump')
-    packages = ('netdump')
+    files = ('/etc/sysconfig/netdump',)
+    packages = ('netdump',)
 
     def setup(self):
         self.addCopySpec("/etc/sysconfig/netdump")
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index 772052f6..905fd239 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -22,7 +22,7 @@ class nis(Plugin, RedHatPlugin):
     """NIS related information
     """
 
-    files = ('/var/yp')
+    files = ('/var/yp',)
 
     def setup(self):
         self.addCopySpec("/etc/yp*.conf")
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index 23f5c439..26ec3afc 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -24,8 +24,8 @@ class nscd(Plugin, RedHatPlugin):
     optionList = [("nscdlogsize", "max size (MiB) to collect per nscd log file",
                    "", 50)]
 
-    files = ('/etc/nscd.conf')
-    packages = ('nscd')
+    files = ('/etc/nscd.conf',)
+    packages = ('nscd',)
 
     def setup(self):
         self.addCopySpec("/etc/nscd.conf")
diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py
index 8e0d0377..e64d6816 100644
--- a/sos/plugins/oddjob.py
+++ b/sos/plugins/oddjob.py
@@ -20,8 +20,8 @@ class oddjob(Plugin, RedHatPlugin):
     """oddjob related information
     """
 
-    files = ('/etc/oddjobd.conf')
-    packages = ('oddjob')
+    files = ('/etc/oddjobd.conf',)
+    packages = ('oddjob',)
 
     def setup(self):
         self.addCopySpec("/etc/oddjobd.conf")
diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py
index 49098794..07f8a35b 100644
--- a/sos/plugins/openssl.py
+++ b/sos/plugins/openssl.py
@@ -20,8 +20,8 @@ class openssl(Plugin, RedHatPlugin):
     """openssl related information
     """
 
-    files = ('/etc/pki/tls/openssl.cnf')
-    packages = ('openssl')
+    files = ('/etc/pki/tls/openssl.cnf',)
+    packages = ('openssl',)
 
     def setup(self):
         self.addCopySpec("/etc/pki/tls/openssl.cnf")
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index d6dc1db0..bd6a4fb0 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -21,8 +21,8 @@ class openswan(Plugin, RedHatPlugin):
     """ipsec related information
     """
 
-    files = ('/etc/ipsec.conf')
-    packages = ('openswan')
+    files = ('/etc/ipsec.conf',)
+    packages = ('openswan',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index b2eda39f..c0699356 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -19,8 +19,8 @@ class postfix(Plugin, RedHatPlugin):
     """mail server related information
     """
 
-    files = ('/etc/rc.d/init.d/postfix')
-    packages = ('postfix')
+    files = ('/etc/rc.d/init.d/postfix',)
+    packages = ('postfix',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index 89c33956..0702b4fb 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -21,8 +21,8 @@ class ppp(Plugin, RedHatPlugin):
     """ppp, wvdial and rp-pppoe related information
     """
 
-    files = ('/etc/wvdial.conf')
-    packages = ('ppp')
+    files = ('/etc/wvdial.conf',)
+    packages = ('ppp',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index f55b9810..313346fe 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -20,8 +20,8 @@ class pxe(Plugin, RedHatPlugin):
     """
 
     optionList = [("tftpboot", 'gathers content in /tftpboot', 'slow', False)]
-    files = ('/usr/sbin/pxeos')
-    packages = ('system-config-netboot-cmd')
+    files = ('/usr/sbin/pxeos',)
+    packages = ('system-config-netboot-cmd',)
 
     def setup(self):
         self.collectExtOutput("/usr/sbin/pxeos -l")
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 00595928..d9fb6394 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -21,8 +21,8 @@ class quagga(Plugin, RedHatPlugin):
     """quagga related information
     """
 
-    files = ('/etc/quagga/zebra.conf')
-    packages = ('quagga')
+    files = ('/etc/quagga/zebra.conf',)
+    packages = ('quagga',)
 
     def setup(self):
         self.addCopySpec("/etc/quagga/")
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index b68e45ae..32980626 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -21,8 +21,8 @@ class radius(Plugin, RedHatPlugin):
     """radius related information
     """
 
-    files = ('/etc/raddb')
-    packages = ('freeradius')
+    files = ('/etc/raddb',)
+    packages = ('freeradius',)
 
     def setup(self):
         self.addCopySpecs(["/etc/raddb", "/etc/pam.d/radiusd", "/var/log/radius"])
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index cf03d024..c94d97ab 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -21,8 +21,8 @@ class sendmail(Plugin, RedHatPlugin):
     """sendmail information
     """
 
-    files = ('/etc/rc.d/init.d/sendmail')
-    packages = ('sendmail')
+    files = ('/etc/rc.d/init.d/sendmail',)
+    packages = ('sendmail',)
 
     def setup(self):
         self.addCopySpecs(["/etc/mail/*", "/var/log/maillog"])
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 0748909e..49f0dc2c 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -22,8 +22,8 @@ class smartcard(Plugin, RedHatPlugin):
     """Smart Card related information
     """
 
-    files = ('/etc/pam_pkcs11/pam_pkcs11.conf')
-    packages = ('pam_pkcs11')
+    files = ('/etc/pam_pkcs11/pam_pkcs11.conf',)
+    packages = ('pam_pkcs11',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index a619cd83..4e01add8 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -21,8 +21,8 @@ class snmp(Plugin, RedHatPlugin):
     """snmp related information
     """
 
-    files = ('/etc/snmp/snmpd.conf')
-    packages = ('net-snmp')
+    files = ('/etc/snmp/snmpd.conf',)
+    packages = ('net-snmp',)
 
     def setup(self):
         self.addCopySpec("/etc/snmp")
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index 575dc3e4..29c06340 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -19,8 +19,8 @@ class squid(Plugin, RedHatPlugin):
     """squid related information
     """
 
-    files = ('/etc/squid/squid.conf')
-    packages = ('squid')
+    files = ('/etc/squid/squid.conf',)
+    packages = ('squid',)
 
     def setup(self):
         self.addCopySpec("/etc/squid/squid.conf")
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index e1acc770..8e6e4edf 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -21,7 +21,7 @@ class sssd(Plugin, RedHatPlugin):
     """sssd-related Diagnostic Information
     """
 
-    packages = ('sssd')
+    packages = ('sssd',)
 
     def setup(self):
         self.addCopySpecs(["/etc/sssd", "/var/log/sssd/*"])
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 8b3a9de9..93e5b967 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -20,7 +20,7 @@ class systemtap(Plugin, RedHatPlugin):
     """SystemTap information
     """
 
-    files = ('/usr/bin/stap')
+    files = ('/usr/bin/stap',)
     packages = ('systemtap', 'systemtap-runtime')
 
     def setup(self):
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index d2babc71..7c70aa86 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -21,8 +21,8 @@ class tftpserver(Plugin, RedHatPlugin):
     """tftpserver related information
     """
 
-    files = ('/etc/xinetd.d/tftp')
-    packages = ('tftp-server')
+    files = ('/etc/xinetd.d/tftp',)
+    packages = ('tftp-server',)
 
     def setup(self):
         self.collectExtOutput("/bin/ls -lanR /tftpboot")
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index 216ed650..f447f543 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -18,7 +18,7 @@ class tomcat(Plugin, RedHatPlugin):
     """Tomcat related information
     """
 
-    packages = ('tomcat5')
+    packages = ('tomcat5',)
 
     def setup(self):
         self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"])
diff --git a/sos/plugins/udhcp.py b/sos/plugins/udhcp.py
index 8b4c39c8..9b84d31b 100644
--- a/sos/plugins/udhcp.py
+++ b/sos/plugins/udhcp.py
@@ -18,8 +18,8 @@ from sos.plugins import Plugin, UbuntuPlugin
 class udhcp(Plugin, UbuntuPlugin):
     """DHCP related information
     """
-    files = ('/etc/init.d/udhcpd')
-    packages = ('udhcpd')
+    files = ('/etc/init.d/udhcpd',)
+    packages = ('udhcpd',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 7282eca7..46b25792 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -19,7 +19,7 @@ class vmware(Plugin, RedHatPlugin):
     """VMWare related information
     """
 
-    files = ('/usr/bin/vmware')
+    files = ('/usr/bin/vmware',)
 
     def setup(self):
         self.collectExtOutput("/usr/bin/vmware -v")
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index 2718159e..22c77617 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -19,7 +19,7 @@ class x11(Plugin, RedHatPlugin):
     """X related information
     """
 
-    files = ('/etc/X11')
+    files = ('/etc/X11',)
 
     def setup(self):
         self.addCopySpecs([
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index f8a8c644..8bce1fe4 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -21,8 +21,8 @@ class xinetd(Plugin, RedHatPlugin):
     """xinetd information
     """
 
-    files = ('/etc/xinetd.conf')
-    packages = ('xinetd')
+    files = ('/etc/xinetd.conf',)
+    packages = ('xinetd',)
 
     def setup(self):
         self.addCopySpec("/etc/xinetd.conf")
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 19722461..c47ee94a 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -19,8 +19,8 @@ class yum(Plugin, RedHatPlugin):
     """yum information
     """
 
-    files = ('/etc/yum.conf')
-    packages = ('yum')
+    files = ('/etc/yum.conf',)
+    packages = ('yum',)
     optionList = [("yumlist", "list repositories and packages", "slow", False)]
     optionList = [("yumdebug", "gather yum debugging data", "slow", False)]
 
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index 928d42ab..5d9af55e 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -38,11 +38,11 @@ except:
 
 class RHELPackageManager(PackageManager):
 
+    _rpms = None
+
     def _get_rpm_list(self):
-        pkg_list = shell_out(["rpm",
-            "-qa",
-            "--queryformat",
-            "%{NAME}|%{VERSION}\\n"]).splitlines()
+        cmd = 'rpm -qa --queryformat "%{NAME}|%{VERSION}\\n"'
+        pkg_list = shell_out(cmd).splitlines()
         self._rpms = {}
         for pkg in pkg_list:
             name, version = pkg.split("|")
-- 
cgit