[lucene-solr] branch branch_8x updated: Allow GPG keys with no spaces

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

romseygeek pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 4e2acd8  Allow GPG keys with no spaces
4e2acd8 is described below

commit 4e2acd8558b10a6ff31cf8b63c29c7097838ba8b
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Mon Feb 11 17:05:50 2019 +0000

    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 98547c4..9f25f16 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)