Verify-Merge: Add exception for single binary whitespace issue

This commit is contained in:
TheCharlatan 2020-12-14 01:28:05 +01:00
parent 8ca15ac97a
commit d22ead567e
No known key found for this signature in database
GPG key ID: 9B79B45691DB4173

View file

@ -186,6 +186,8 @@ def verify_checksums(assert_files):
# The OSX SDK may change from time to time: # The OSX SDK may change from time to time:
if 'sdk' in assert_file_contents[i]: if 'sdk' in assert_file_contents[i]:
continue continue
if assert_file_contents[i].strip() == '\'':
continue
if assert_file_contents[i] != first_file_contents[i]: if assert_file_contents[i] != first_file_contents[i]:
sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ') sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ')
sys.stderr.write(assert_file['path'] + ':\n' + assert_file_contents[i]) sys.stderr.write(assert_file['path'] + ':\n' + assert_file_contents[i])