From 8ac63f4f313a1e94636964cb047c9e999e91ba3b Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Wed, 20 Nov 2019 00:32:50 +0100 Subject: [PATCH] verify-merge.py : code consistency improvements. --- verify-merge.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/verify-merge.py b/verify-merge.py index 7566cd1..d59cc72 100755 --- a/verify-merge.py +++ b/verify-merge.py @@ -12,8 +12,8 @@ def verify(): global args, workdir if args.import_keys: os.chdir('gitian-pubkeys') - print('Importing pubkeys...') - keys = [f for f in glob.glob("*.asc", recursive=True)] + print('Importing gpg pubkeys...') + keys = [f for f in glob.glob('*.asc', recursive=False)] for key in keys: subprocess.check_call([GPG, '--import', key]) os.chdir('../') @@ -38,29 +38,30 @@ def verify(): print('All signatures verified correctly.\n') print('Beginning checksum comparison...\n') - # Check that the contents between the assertion signers match. This is meant for quick verification, not for validation of their contents + # Check that the contents between the assertion signers match. + # This is meant for quick verification, not for validation of their contents. # TODO: prevent false positives related to filenames / whitespace / formatting. builds = glob.glob(ver_pattern + '*') for build in builds: first_file = glob.glob(build + '/*/*.assert', recursive=False)[0] - f = open(first_file, "r") + f = open(first_file, 'r') first_file_contents = f.readlines() f.close() for assert_file in glob.glob(build + '/*/*.assert', recursive=False): - f = open(assert_file, "r") + f = open(assert_file, 'r') assert_file_contents = f.readlines() f.close() for i in range(len(assert_file_contents)): - # compare everything in the assertions until the base image manifests - if assert_file_contents[i] == "- base_manifests: !!omap\n": + # Compare each line in the assertion file until base_manifests: + if assert_file_contents[i] == '- base_manifests: !!omap\n': break - # the OSX SDK may change from time to time - if "sdk" in assert_file_contents[i]: + # The OSX SDK may change from time to time: + if 'sdk' in assert_file_contents[i]: continue if assert_file_contents[i] != first_file_contents[i]: - print("ERROR: Found conflicting contents on line:", i) - print(assert_file, ":\n", assert_file_contents[i]) - print(first_file, ":\n", first_file_contents[i]) + sys.stderr.write('ERROR: Found conflicting contents on line:', i) + sys.stderr.write(assert_file + ':\n' + assert_file_contents[i]) + sys.stderr.write(first_file + ':\n' + first_file_contents[i]) exit(1) print('No discrepancies found in assertion files.') @@ -68,15 +69,15 @@ def verify(): os.chdir(workdir) def main(): - host_repo = "git@github.com/monero-project/gitian.sigs" + host_repo = 'git@github.com/monero-project/gitian.sigs' global args, workdir parser = argparse.ArgumentParser(usage='%(prog)s [options]', description='Use this script to verify the signatures of existing gitian assert files and / or assert files in a specific pull request.') - parser.add_argument('-p', '--pull_id', dest='pull_id', help='Github Pull request id to check') - parser.add_argument('-r', '--remote', dest='remote', default='upstream', help='git remote repository') + parser.add_argument('-p', '--pull_id', dest='pull_id', help='GitHub Pull request id to check') + parser.add_argument('-r', '--remote', dest='remote', default='upstream', help='The git remote repository') parser.add_argument('-t', '--target-branch', dest='target_branch', default='master', help='Remote repository merge into branch') parser.add_argument('-m', '--merge', action='store_true', dest='merge', help='Merge the given pull request id') - parser.add_argument('-k', '--refresh-keys', action='store_true', dest='refresh_keys', help='refresh all pgp public keys that are currently in the gpg keyring.') - parser.add_argument('-i', '--import-keys', action='store_true', dest='import_keys', help='import all public keys in the gitian-pubkeys directory to the gpg keyring.') + parser.add_argument('-k', '--refresh-keys', action='store_true', dest='refresh_keys', help='Refresh all public keys that are currently in the gpg keyring.') + parser.add_argument('-i', '--import-keys', action='store_true', dest='import_keys', help='Import all public keys in the gitian-pubkeys directory to the gpg keyring.') parser.add_argument('-o', '--no-verify', action='store_true', dest='no_verify', help='Do not run any signature verification') parser.add_argument('-v', '--version', dest='version', help='Version number of sigs to be verified (defaults to all versions if not specified).') @@ -85,18 +86,17 @@ def main(): workdir = os.getcwd() if args.pull_id != None: # Get branch from remote pull request and compare - head_branch = args.pull_id+'_head' - + head_branch = args.pull_id + '_head' subprocess.check_call([GIT, 'fetch', args.remote]) - subprocess.check_call([GIT, 'checkout', args.remote+'/'+args.target_branch]) - subprocess.check_call([GIT, 'fetch','-q', args.remote, 'pull/'+args.pull_id+'/head:'+head_branch]) + subprocess.check_call([GIT, 'checkout', args.remote + '/' + args.target_branch]) + subprocess.check_call([GIT, 'fetch', '-q', args.remote, 'pull/' + args.pull_id + '/head:' + head_branch]) subprocess.check_call([GIT, 'checkout', '-f', head_branch]) if args.merge: # Hard reset the target branch to the remote's state and merge the pull request's head branch into it subprocess.check_call([GIT, 'checkout', args.target_branch]) subprocess.check_call([GIT, 'reset', '--hard', args.remote + '/' + args.target_branch]) print('Merging and signing pull request #' + args.pull_id + ' , if you are using a smartcard, confirm the signature now.') - subprocess.check_call([GIT, 'merge','-q', '--commit', '--no-edit', '-m', 'Merge pull request #'+args.pull_id+' into '+args.target_branch, '--no-ff', '--gpg-sign', head_branch]) + subprocess.check_call([GIT, 'merge', '-q', '--commit', '--no-edit', '-m', 'Merge pull request #' + args.pull_id + ' into ' + args.target_branch, '--no-ff', '--gpg-sign', head_branch]) if not args.no_verify: verify() subprocess.check_call([GIT, 'checkout', 'master'])