diff options
| -rw-r--r-- | src/lib/sos/plugintools.py | 11 | ||||
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/src/lib/sos/plugintools.py b/src/lib/sos/plugintools.py index eb9a32dc..f6b9e40b 100644 --- a/src/lib/sos/plugintools.py +++ b/src/lib/sos/plugintools.py @@ -127,11 +127,12 @@ class PluginBase: # Recurse to copy whatever it points to newpath = os.path.normpath(os.path.join(os.path.dirname(srcpath), link)) - if os.path.exists(newpath): - try: - self.doCopyFileOrDir(newpath) - except: - sys.stderr.write("3Problem at path %s" % newpath) + try: + self.doCopyFileOrDir(newpath) + except EnvironmentError, (errno, strerror): + if (errno != 17): + # we ignore 'file exists' errors + sys.stderr.write("3Problem at path %s\n" % newpath) sys.stderr.flush() return abspath diff --git a/src/setup.py b/src/setup.py index fb42c74c..2db8fd94 100644 --- a/src/setup.py +++ b/src/setup.py @@ -9,7 +9,7 @@ import sys,os,time # change release in spec file along with this version string setup( name = 'sos', - version = '1.2', + version = '1.3', description = 'System Support Tools', long_description = """Sos is a set of tools that gathers information about system hardware and configuration. The information can then be used for diff --git a/src/sos.spec b/src/sos.spec index c627bc5a..605004db 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -2,7 +2,7 @@ Summary: System Support Tools Name: sos -Version: 1.2 +Version: 1.3 Release: 1%{?dist} License: GPL Group: Development/Libraries @@ -46,12 +46,18 @@ rm -rf $RPM_BUILD_ROOT %doc README TODO %changelog +* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.3-1 +- really fixed bz_219654 + +* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.2-1 +- fixed a build problem + * Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.1-1 - Tighten permissions of tmp directory so only readable by creator bz_219657 -- Don't try to copy nonexistant targets of symlinks bz_219654 +- Don't print message 'Problem at path ...' bz_219654 - Removed useless message bz_219670 - Preserve file modification times bz_219674 -- Removed unneeded confusing message bz_219712 +- Removed unneeded message about files on copyProhibitedList bz_219712 * Wed Aug 30 2006 Steve Conklin <sconklin at redhat dot com> - 1.0-1 - Seperated upstream and RPM versioning |