- dont re-add duplicate files

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@789 ef72aa8b-4018-0410-8976-d6e080ef94d8

3 files changed, 5 insertions, 4 deletions

diff --git a/sos.spec b/sos.spec
index 5eb83cbf..3dcba178 100644
--- a/sos.spec
+++ b/sos.spec
@@ -53,7 +53,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
-* Wed Feb 17 2010 Adam Stokes <ajs at redhat dot com> = 1.9-1
+* Thu Mar 04 2010 Adam Stokes <ajs at redhat dot com> = 1.9-1
 - version bump 1.9
 - replaced compression utility with xz
 - strip threading/multiprocessing
diff --git a/sos/plugintools.py b/sos/plugintools.py
index a9f01e81..1562440a 100644
--- a/sos/plugintools.py
+++ b/sos/plugintools.py
@@ -300,7 +300,8 @@ class PluginBase:
             return False
         # Glob case handling is such that a valid non-glob is a reduced glob
         for filespec in glob.glob(copyspec):
-            self.copyPaths.append(filespec)
+            if filespec not in self.copyPaths:
+                self.copyPaths.append(filespec)
 
     def callExtProg(self, prog):
         """ Execute a command independantly of the output gathering part of
diff --git a/sos/sosreport.py b/sos/sosreport.py
index 7304bafe..e4dc05b0 100755
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -699,9 +699,9 @@ No changes will be made to your system.
     plugruncount = 0
     for i in izip(GlobalVars.loadedplugins):
         plugruncount += 1
-        sys.stdout.write("\r")
-        sys.stdout.write("  Completed [%d/%d] ...      " % (plugruncount, 
+        sys.stdout.write("\r  Completed [%d/%d] ...      " % (plugruncount, 
                                                           len(GlobalVars.loadedplugins)))
+        sys.stdout.flush()
         plugname, plug = i[0]
         try:
             plug.copyStuff()