[cig-commits] r18442 - cs/buildbot/trunk/buildbot/scripts

[brad at geodynamics.org]

Author: brad
Date: 2011-05-23 09:00:42 -0700 (Mon, 23 May 2011)
New Revision: 18442

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Fixed bug (source directory not included in packing list).

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2011-05-23 15:50:49 UTC (rev 18441)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2011-05-23 16:00:42 UTC (rev 18442)
@@ -35,21 +35,22 @@
         self.directories = binDirs + libDirs + miscDirs
 
         self.extraFiles = config.packaging.files
+        self.exclude = config.packaging.exclude
 
         self.programs = []
         for d in binDirs:
             self.programs.extend(walkDirTree(d))
-        self.programs = filterList(self.programs, config.packaging.exclude)
+        self.programs = filterList(self.programs, self.exclude)
 
         self.libraries = []
         for d in libDirs:
             self.libraries.extend(walkDirTree(d))
-        self.libraries = filterList(self.libraries, config.packaging.exclude)
+        self.libraries = filterList(self.libraries, self.exclude)
             
         self.misc = []
         for d in miscDirs:
             self.misc.extend(walkDirTree(d))
-        self.misc = filterList(self.misc, config.packaging.exclude)
+        self.misc = filterList(self.misc, self.exclude)
             
         # Scripts are application specific.
         self.scripts = []
@@ -90,6 +91,9 @@
 
     def addDirectory(self, d):
         self.directories.append(d)
+        newFiles = walkDirTree(d)
+        newFiles = filterList(newFiles, self.exclude)
+        self.misc.extend(newFiles)
 
 
     def files(self):