aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-01-18 20:54:20 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-01-18 20:54:20 +0000
commit6a59f99df8515ea7ea0cf5b4f3abf2835e0d5047 (patch)
tree960d6d8949c84fcf2eae9392d24275ceb8387b17 /src/lib
parent60cc884ad6959d068415291c8c1195b290d20007 (diff)
downloadsos-6a59f99df8515ea7ea0cf5b4f3abf2835e0d5047.tar.gz
progressbar merge, plugin update
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@681 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/sos/plugins/sanitize.py3
-rw-r--r--src/lib/sos/plugintools.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/sos/plugins/sanitize.py b/src/lib/sos/plugins/sanitize.py
index 8d7719d4..00c883ee 100644
--- a/src/lib/sos/plugins/sanitize.py
+++ b/src/lib/sos/plugins/sanitize.py
@@ -18,9 +18,10 @@ import glob
import socket
class sanitize(sos.plugintools.PluginBase):
- """ sanitize plugin
+ """ sanitize specified log files, etc
"""
def defaultenabled(self):
+ # disabled by default b/c still a work in progress
return False
def setup(self):
diff --git a/src/lib/sos/plugintools.py b/src/lib/sos/plugintools.py
index 927630bd..b8b4ed7a 100644
--- a/src/lib/sos/plugintools.py
+++ b/src/lib/sos/plugintools.py
@@ -159,7 +159,7 @@ class PluginBase:
self.soslog.log(logging.VERBOSE3, "copying file %s" % srcpath)
try:
tdstpath, abspath = self.__copyFile(srcpath)
- except "AlreadyExists":
+ except PluginException:
self.soslog.log(logging.DEBUG, "error copying file %s (already exists)" % (srcpath))
return
except IOError: