Unified Diff: packagerChrome.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.
« packager.py ('K')
|
« packager.py ('k')
|
packagerGecko.py » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: packagerChrome.py |
| diff --git a/packagerChrome.py b/packagerChrome.py |
| index 237cb2167ea5d84824d3602ddf20308a0018d828..bf346efe48a9b10a2e90ca8e6c3eba4330f196b3 100644 |
| --- a/packagerChrome.py |
| +++ b/packagerChrome.py |
| @@ -326,12 +326,13 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil |
| 'metadata': metadata, |
| } |
| + skip = metadata.options('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'): |
|
Sebastian Noack
2016/01/12 15:53:31
How about unifying the logic here:
try:
mapping
kzar
2016/01/12 17:31:37
I've done it slightly differently but good point,
|
| files.readMappedFiles(metadata.items('mapping')) |
| - files.read(baseDir) |
| + files.read(baseDir, skip=skip) |
| if metadata.has_section('convert_js'): |
| convertJS(params, files) |
