Allow GPG keys with no spaces

This commit is contained in:
Alan Woodward 2019-02-11 17:05:50 +00:00
parent 75c5325932
commit 55c061770e
1 changed files with 1 additions and 1 deletions

View File

@ -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)