Issue 3498 - Improve file mapping / skipping logic

packager.py

Index: packager.py
diff --git a/packager.py b/packager.py
index 71ac371faf5f11b623c99ff9ed3aebbc2f8ce747..719b333f6b2afa66c68f3ebe602335a16cb2c9b0 100644
--- a/packager.py
+++ b/packager.py
@@ -93,13 +93,12 @@ class Files(dict):
       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)
+          self.read(os.path.join(path, file), name, skip)

[Wladimir Palant, 2016/01/12 12:16:33]

No, skip as implemented right now is only meant to apply on top level. With this
change we will skip the chrome directory in any subdirectory for Gecko builds.
Maybe it will work correctly if the check above is changed into |name not in
skip|.

[kzar, 2016/01/12 13:09:47]

Done.

     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: