13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
13 lines
942 B
Diff
13 lines
942 B
Diff
diff -up sos-2.2/sos/plugins/rpm.py.orig sos-2.2/sos/plugins/rpm.py
|
|
--- sos-2.2/sos/plugins/rpm.py.orig 2012-03-06 13:13:42.455475271 +0000
|
|
+++ sos-2.2/sos/plugins/rpm.py 2012-03-06 13:13:43.919475297 +0000
|
|
@@ -24,7 +24,7 @@ class rpm(sos.plugintools.PluginBase):
|
|
self.addCopySpec("/var/log/rpmpkgs")
|
|
|
|
if self.getOption("rpmq"):
|
|
- self.collectExtOutput("/bin/rpm -qa --qf=\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~%{INSTALLTIME:date}\n\" --nosignature --nodigest|/bin/awk -F ~~ '{printf \"%-60s%s\\n\",$1,$2}'|sort", root_symlink = "installed-rpms")
|
|
+ self.collectExtOutput("/bin/rpm -qa --qf=\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~%{INSTALLTIME:date}\n\" --nosignature --nodigest|/bin/awk -F ~~ '{printf \"%-59s %s\\n\",$1,$2}'|sort", root_symlink = "installed-rpms")
|
|
|
|
if self.getOption("rpmva"):
|
|
self.collectExtOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600)
|