aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-12-06 09:49:16 +0000
committernavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-12-06 09:49:16 +0000
commit4ebca38cde65ae814b3e781e3c4eb65df2f7f1cc (patch)
treec8186aad74f9042b62c416e520f4307e8ddb5bd9
parent4c38c7a9021b0ca90446f818910502d69c898ebc (diff)
downloadsos-4ebca38cde65ae814b3e781e3c4eb65df2f7f1cc.tar.gz
typo in cluster.py and updated spec file
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@463 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--src/lib/sos/plugins/cluster.py2
-rw-r--r--src/sos.spec21
2 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/sos/plugins/cluster.py b/src/lib/sos/plugins/cluster.py
index ff2a233c..6d4de2a0 100644
--- a/src/lib/sos/plugins/cluster.py
+++ b/src/lib/sos/plugins/cluster.py
@@ -94,7 +94,7 @@ class cluster(sos.plugintools.PluginBase):
elif found == 1:
self.addDiagnose("required module is not available for current kernel: %s" % modname)
elif found == 2:
- self.addDiagnose("required module is available but not loaded: %s" % module)
+ self.addDiagnose("required module is available but not loaded: %s" % modname)
for pkg in pkgs_check:
if self.cInfo["policy"].pkgByName(pkg) == None:
diff --git a/src/sos.spec b/src/sos.spec
index dfece395..69107896 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -2,7 +2,7 @@
%define name sos
%define version 1.8
-%define release 0pre0
+%define release 0pre2
%define _localedir %_datadir/locale
@@ -63,11 +63,13 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Wed Nov 21 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.8-0
-- sosGetCommandOutput() does not block on hung processes (bz368261)
-- work-around missing traceback.format_exc() in RHEL4 (bz361861)
-- device-mapper: use /sbin/lvm_dump to collect dm related info (bz394781)
-- unattended --batch option (bz386691)
-- sos could hang when accessing /sys/hypervisor/uuid (bz371251)
+- Resolves: bz368261 sosGetCommandOutput() does not block on hung processes
+- Resolves: bz361861 work-around missing traceback.format_exc() in RHEL4
+- Resolves: bz394781 device-mapper: use /sbin/lvm_dump to collect dm related info
+- Resolves: bz386691 unattended --batch option
+- Resolves: bz371251 sos could hang when accessing /sys/hypervisor/uuid
+- selinux: always collect sestatus
+- added many languages
- added --debug option which causes exceptions not to be trapped
- updated to sysreport-1.4.3-13.el5
- ftp upload to dropbox with --upload
@@ -101,7 +103,7 @@ rm -rf ${RPM_BUILD_ROOT}
- simply collect output of fdisk -l in one go
- handle sysreport invocation properly (warn if shell is interactive, otherwise spawn sysreport.legacy)
- progress bar don't show 100% until finished() is called
-- added lspci -t (bz238778)
+- Resolves: bz238778 added lspci -t
- now runs on RHEL3 as well (python 2.2)
- replaced commonPrefix() with faster code
- filesys: one fdisk -l for all
@@ -111,8 +113,9 @@ rm -rf ${RPM_BUILD_ROOT}
- systemtap: cleaned up and added checkenabled() method
- added kdump plugin
- added collection of /etc/inittab
-- apply regex to case number in sysreport for RHEL4 (bz332151)
-- apply regex to case number in sysreport for RHEL5 (bz332211)
+- Resolves: bz332151 apply regex to case number in sysreport for RHEL4
+- Resolves: bz332211 apply regex to case number in sysreport for RHEL5
+- Resolves: bz400111 sos incorrectly reports cluster data in SMP machine
* Wed Aug 13 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.7-8
- added README.rh-upload-core