Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: packagerGecko.py

Issue 29333368: Issue 3498 - Improve file mapping / skipping logic (Closed)
Patch Set: Pass the skip parameter for both Gecko Files.read calls Created Jan. 12, 2016, 1:24 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« packagerChrome.py ('K') | « packagerChrome.py ('k') | packagerSafari.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packagerGecko.py
diff --git a/packagerGecko.py b/packagerGecko.py
index 748bf2810e47663e26e9907c8dbdcfc47aeaff91..12af5405567bf839573f32cf68832321351f97eb 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -338,15 +338,17 @@ def createBuild(baseDir, type="gecko", outFile=None, locales=None, buildNum=None
'multicompartment': multicompartment,
}
+ skip = metadata.options('mapping') if metadata.has_section('mapping') else []
+ skip.append('chrome')
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)
for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
if os.path.isdir(path):
- files.read(path, 'chrome/%s' % name)
+ files.read(path, 'chrome/%s' % name, skip=skip)
importLocales(params, files)
fixupLocales(params, files)
if not 'bootstrap.js' in files:
« packagerChrome.py ('K') | « packagerChrome.py ('k') | packagerSafari.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld