]>
Commit | Line | Data |
---|---|---|
af2c0365 ER |
1 | --- chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py~ 2015-11-15 11:03:38.000000000 +0200 |
2 | +++ chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-11-15 13:49:46.409735857 +0200 | |
3 | @@ -850,7 +850,8 @@ | |
f0db7b91 ER |
4 | elif include_file_path in IGNORED_INCLUDE_FILES: |
5 | continue | |
6 | else: | |
af2c0365 | 7 | - die('Failed to find file ' + include_file_path) |
f0db7b91 ER |
8 | + print('Failed to find file: ' + include_file_path) |
9 | + continue | |
10 | ||
11 | # At this point we've found the file. Check if its in our ignore list which | |
12 | # means that the list should be updated to no longer mention this file. | |
13 | @@ -776,7 +777,8 @@ | |
14 | licensecheck_path = os.path.abspath(os.path.join( | |
15 | source_root, 'third_party', 'devscripts', 'licensecheck.pl')); | |
16 | if not os.path.exists(licensecheck_path): | |
17 | - die('Could not find licensecheck.pl: ' + str(licensecheck_path)) | |
18 | + print('Could not find licensecheck.pl: ' + str(licensecheck_path)) | |
19 | + return True | |
20 | ||
21 | check_process = subprocess.Popen([licensecheck_path, | |
22 | '-l', '100', |