diff options
| author | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-05-25 14:27:50 +0000 |
|---|---|---|
| committer | sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-05-25 14:27:50 +0000 |
| commit | 3b6f37312b6a57ba054483b0fed9ad7374da41d3 (patch) | |
| tree | 7c9240622986de868f3d623cee7b070e49f10ff5 | |
| parent | fa08afe4ce3826784bdba53dae396516269d695e (diff) | |
| download | sos-3b6f37312b6a57ba054483b0fed9ad7374da41d3.tar.gz | |
Fixed a backtrace due to bad handling of nonexistent file in kernel plugin, and some minor typos, bumped release number
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@135 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | src/lib/sos/plugins/kernel.py | 4 | ||||
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/sos/plugins/kernel.py b/src/lib/sos/plugins/kernel.py index d9272d18..3e64252d 100644 --- a/src/lib/sos/plugins/kernel.py +++ b/src/lib/sos/plugins/kernel.py @@ -37,7 +37,7 @@ class kernel(sos.plugintools.PluginBase): {'regex':'egenera*', 'description':'Egenera module'}, {'regex':'emcp*', 'description':'EMC module'}, {'regex':'ocfs*', 'description':'OCFS module'}, - {'regex':'nvidea', 'description':'nVidea module'}, + {'regex':'nvidia', 'description':'NVidia module'}, {'regex':'ati-', 'description':'ATI module'} ] @@ -93,6 +93,8 @@ class kernel(sos.plugintools.PluginBase): for modname in modules: modname=modname.split(" ")[0] modinfo_srcver = commands.getoutput("/sbin/modinfo -F srcversion %s" % modname) + if not os.access("/sys/module/%s/srcversion" % modname, os.R_OK): + continue infd = open("/sys/module/%s/srcversion" % modname, "r") sys_srcver = infd.read().strip("\n") infd.close() diff --git a/src/setup.py b/src/setup.py index 959e006c..86b239d5 100644 --- a/src/setup.py +++ b/src/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup from ConfigParser import ConfigParser import sys,os,time -# change release in spec file along with this version string +# change version in spec file along with this string setup( name = 'sos', version = '1.4', diff --git a/src/sos.spec b/src/sos.spec index 2f06049b..d43ceff6 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -3,7 +3,7 @@ Summary: System Support Tools Name: sos Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc README TODO %changelog +* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-2 +- Fixed a backtrace on nonexistent file in kernel plugin (thanks, David Robinson) + * Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3 - including patches to fix the following: - Resolves: bz219745 sosreport needs a man page |