From d22ead567e7d125255bb271144323be19bc13024 Mon Sep 17 00:00:00 2001 From: TheCharlatan Date: Mon, 14 Dec 2020 01:28:05 +0100 Subject: [PATCH] Verify-Merge: Add exception for single binary whitespace issue --- verify-merge.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/verify-merge.py b/verify-merge.py index 4ad5449..d4f40d7 100755 --- a/verify-merge.py +++ b/verify-merge.py @@ -186,6 +186,8 @@ def verify_checksums(assert_files): # The OSX SDK may change from time to time: if 'sdk' in assert_file_contents[i]: continue + if assert_file_contents[i].strip() == '\'': + continue 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(assert_file['path'] + ':\n' + assert_file_contents[i])