Merge pull request #38 from jonathancross/fix_verify_merge

verify-merge.py : fix error in sys.stderr.write
This commit is contained in:
Reproducibility Matters 2019-12-03 12:49:18 +01:00 committed by GitHub
commit a4062edb68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,7 +59,7 @@ def verify():
if 'sdk' in assert_file_contents[i]:
continue
if assert_file_contents[i] != first_file_contents[i]:
sys.stderr.write('ERROR: Found conflicting contents on line:', i)
sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ')
sys.stderr.write(assert_file + ':\n' + assert_file_contents[i])
sys.stderr.write(first_file + ':\n' + first_file_contents[i])
exit(1)