Issue 3498 - Improve file mapping / skipping logic

packager.py

Index: packager.py
diff --git a/packager.py b/packager.py
index 71ac371faf5f11b623c99ff9ed3aebbc2f8ce747..cfcbd7914ed8c9f46a76db461beb3d77e052feba 100644
--- a/packager.py
+++ b/packager.py
@@ -92,14 +92,13 @@ class Files(dict):
     if os.path.isdir(path):
       for file in os.listdir(path):
         name = relpath + ('/' if relpath != '' else '') + file
-        if (skip == None or file not in skip) and self.isIncluded(name):
-          self.read(os.path.join(path, file), name)
+        if (skip == None or name not in skip) and self.isIncluded(name):

[Sebastian Noack, 2016/01/12 15:53:31]

Nit: While changing this line anyway |is None|. Or perhaps make the argument
default to () eliminating this check.

[kzar, 2016/01/12 17:31:37]

Done.

+          self.read(os.path.join(path, file), name, skip)
     else:
       with open(path, 'rb') as file:
         if relpath in self:
           print >>sys.stderr, 'Warning: File %s defined multiple times' % relpath
-        else:
-          self[relpath] = file.read()
+        self[relpath] = file.read()
 
   def readMappedFiles(self, mappings):
     for item in mappings: