You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ma...@apache.org on 2023/01/17 18:20:01 UTC
[solr] branch branch_9x updated: update releaseWizard.py to support offline gpg key (#1288)
This is an automated email from the ASF dual-hosted git repository.
magibney pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 86b357a3cc2 update releaseWizard.py to support offline gpg key (#1288)
86b357a3cc2 is described below
commit 86b357a3cc2084b571fc55d3f99c11b80c015d2e
Author: Michael Gibney <mi...@michaelgibney.net>
AuthorDate: Fri Jan 13 12:56:06 2023 -0500
update releaseWizard.py to support offline gpg key (#1288)
(cherry picked from commit ac32afdd8256edec4a44514c92667610f13a97f8)
---
dev-tools/scripts/releaseWizard.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index 8fa8167f602..386d8e6a1ff 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -1151,14 +1151,14 @@ def configure_pgp(gpg_todo):
res = run("gpg --list-secret-keys %s" % gpg_fingerprint)
print("Found key %s on your private gpg keychain" % gpg_id)
# Check rsa and key length >= 4096
- match = re.search(r'^sec +((rsa|dsa)(\d{4})) ', res)
+ match = re.search(r'^sec#? +((rsa|dsa)(\d{4})) ', res)
type = "(unknown)"
length = -1
if match:
type = match.group(2)
length = int(match.group(3))
else:
- match = re.search(r'^sec +((\d{4})([DR])/.*?) ', res)
+ match = re.search(r'^sec#? +((\d{4})([DR])/.*?) ', res)
if match:
type = 'rsa' if match.group(3) == 'R' else 'dsa'
length = int(match.group(2))