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:21:33 UTC

[solr] branch branch_9_1 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_9_1
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9_1 by this push:
     new d998e63978a update releaseWizard.py to support offline gpg key (#1288)
d998e63978a is described below

commit d998e63978abfedde3b75bab4ba6e1e78ddb5944
Author: Michael Gibney <mi...@michaelgibney.net>
AuthorDate: Tue Jan 17 13:20:56 2023 -0500

    update releaseWizard.py to support offline gpg key (#1288)
    
    (cherry picked from commit 86b357a3cc2084b571fc55d3f99c11b80c015d2e)
---
 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 042f3eeb189..715de0df4c1 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -1152,14 +1152,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))