Commit a4062edb68b9546c9612d3ef42694f77e0ff24ff
Merge pull request #38 from jonathancross/fix_verify_merge
verify-merge.py : fix error in sys.stderr.writeReproducibility Matters authored on 12/3/2019, 11:49:18 AM
GitHub committed on 12/3/2019, 11:49:18 AM
Parent: 9c951d47715c2d33a398e2238db3ef561bb97502
Parent: 47e05f92886ccbe7815b3348a06ef5a89d661fd8
Files changed
| verify-merge.py | changed |
| verify-merge.py | ||
|---|---|---|
| @@ -58,9 +58,9 @@ | ||
| 58 | 58 | # The OSX SDK may change from time to time: |
| 59 | 59 | if 'sdk' in assert_file_contents[i]: |
| 60 | 60 | continue |
| 61 | 61 | if assert_file_contents[i] != first_file_contents[i]: |
| 62 | - sys.stderr.write('ERROR: Found conflicting contents on line:', i) | |
| 62 | + sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ') | |
| 63 | 63 | sys.stderr.write(assert_file + ':\n' + assert_file_contents[i]) |
| 64 | 64 | sys.stderr.write(first_file + ':\n' + first_file_contents[i]) |
| 65 | 65 | exit(1) |
| 66 | 66 | |
Built with git-ssb-web