13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
diff -up sos-2.2/sos/plugins/yum.py.orig sos-2.2/sos/plugins/yum.py
|
|
--- sos-2.2/sos/plugins/yum.py.orig 2011-08-12 12:33:23.768711944 +0100
|
|
+++ sos-2.2/sos/plugins/yum.py 2011-08-12 12:54:20.547487066 +0100
|
|
@@ -19,8 +19,8 @@ class yum(sos.plugintools.PluginBase):
|
|
"""yum information
|
|
"""
|
|
|
|
- optionList = [("yumlist", "list repositories and packages", "slow", False)]
|
|
- optionList = [("yumdebug", "gather yum debugging data", "slow", False)]
|
|
+ optionList = [("yumlist", "list repositories and packages", "slow", False),
|
|
+ ("yumdebug", "gather yum debugging data", "slow", False)]
|
|
|
|
def checkenabled(self):
|
|
self.files = [ "/etc/yum.conf" ]
|
|
@@ -43,9 +43,10 @@ class yum(sos.plugintools.PluginBase):
|
|
self.addCopySpec("/etc/yum.conf")
|
|
self.addCopySpec("/var/log/yum.log")
|
|
|
|
+ # Get a list of channels the machine is subscribed to.
|
|
+ self.collectExtOutput("yum -C repolist")
|
|
+
|
|
if self.getOption("yumlist"):
|
|
- # Get a list of channels the machine is subscribed to.
|
|
- self.collectExtOutput("/bin/echo \"repo list\" | /usr/bin/yum shell")
|
|
# List various information about available packages
|
|
self.collectExtOutput("/usr/bin/yum list")
|
|
|