Issue 3498 - Improve file mapping / skipping logic

packagerGecko.py

Index: packagerGecko.py
diff --git a/packagerGecko.py b/packagerGecko.py
index 748bf2810e47663e26e9907c8dbdcfc47aeaff91..f07039a5c7d20ab9ccb436c43c652425b87d529f 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -338,12 +338,13 @@ def createBuild(baseDir, type="gecko", outFile=None, locales=None, buildNum=None
     'multicompartment': multicompartment,
   }
 
+  skip = metadata.options('mapping') if metadata.has_section('mapping') else []
   files = Files(getPackageFiles(params), getIgnoredFiles(params),
                 process=lambda path, data: processFile(path, data, params))
   files['install.rdf'] = createManifest(params)
   if metadata.has_section('mapping'):
     files.readMappedFiles(metadata.items('mapping'))
-  files.read(baseDir, skip=('chrome'))
+  files.read(baseDir, skip=skip + ['chrome'])
   for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
     if os.path.isdir(path):
       files.read(path, 'chrome/%s' % name)

[Wladimir Palant, 2016/01/12 13:17:06]

Same skip parameter has to be specified here as well. So I'd do the following
above:

  skip.append('chrome')

And then specify skip=skip in the files.read() calls here and above.

[kzar, 2016/01/12 13:26:03]

Done.