Unified Diff: packagerSafari.py
Issue 29333368:
Issue 3498 - Improve file mapping / skipping logic (Closed)
Patch Set: Remove redundant parenthesis
Created Jan. 12, 2016, 5:33 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« packagerGecko.py ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: packagerSafari.py |
| diff --git a/packagerSafari.py b/packagerSafari.py |
| index d999e943c1af764db6c453cb412bcdf861eb9ccc..7a12e237a86d30ce1f41d3b6aa56e3df7965cc62 100644 |
| --- a/packagerSafari.py |
| +++ b/packagerSafari.py |
| @@ -228,11 +228,11 @@ def createBuild(baseDir, type, outFile=None, buildNum=None, releaseBuild=False, |
| 'metadata': metadata, |
| } |
| + mapped = metadata.items('mapping') if metadata.has_section('mapping') else [] |
| files = Files(getPackageFiles(params), getIgnoredFiles(params), |
| process=lambda path, data: processFile(path, data, params)) |
| - if metadata.has_section('mapping'): |
| - files.readMappedFiles(metadata.items('mapping')) |
| - files.read(baseDir) |
| + files.readMappedFiles(mapped) |
| + files.read(baseDir, skip=[opt for opt, _ in mapped]) |
| if metadata.has_section('convert_js'): |
| convertJS(params, files) |
« no previous file with comments
|
« packagerGecko.py ('k')
|
no next file »
|
no next file with comments »
