From 6a59f99df8515ea7ea0cf5b4f3abf2835e0d5047 Mon Sep 17 00:00:00 2001
From: astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Mon, 18 Jan 2010 20:54:20 +0000
Subject: progressbar merge, plugin update

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@681 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/lib/sos/plugins/sanitize.py | 3 ++-
 src/lib/sos/plugintools.py      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib')

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:
-- 
cgit