From 47e05f92886ccbe7815b3348a06ef5a89d661fd8 Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Mon, 25 Nov 2019 17:00:45 +0100 Subject: [PATCH] verify-merge.py : fix error in sys.stderr.write --- verify-merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verify-merge.py b/verify-merge.py index d59cc72..d650a44 100755 --- a/verify-merge.py +++ b/verify-merge.py @@ -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)