From 4e2acd8558b10a6ff31cf8b63c29c7097838ba8b Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Mon, 11 Feb 2019 17:05:50 +0000 Subject: [PATCH] Allow GPG keys with no spaces --- dev-tools/scripts/buildAndPushRelease.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py index 98547c4aa31..9f25f1629bb 100644 --- a/dev-tools/scripts/buildAndPushRelease.py +++ b/dev-tools/scripts/buildAndPushRelease.py @@ -314,7 +314,7 @@ def check_key_in_keys(gpgKeyID, local_keys): gpgKeyID40Char = "%s %s %s %s %s %s %s %s %s %s" % \ (gpgKeyID[0:4], gpgKeyID[4:8], gpgKeyID[8:12], gpgKeyID[12:16], gpgKeyID[16:20], gpgKeyID[20:24], gpgKeyID[24:28], gpgKeyID[28:32], gpgKeyID[32:36], gpgKeyID[36:]) - re_to_match = r"^pub .*\n\s+%s" % gpgKeyID40Char + re_to_match = r"^pub .*\n\s+(%s|%s)" % (gpgKeyID40Char, gpgKeyID) else: print('Invalid gpg key id format. Must be 8 byte short ID or 40 byte fingerprint, with or without 0x prefix, no spaces.') exit(2)