svn commit: r1151296 - /subversion/trunk/tools/dist/release.py

[hw...@apache.org]

Author: hwright
Date: Tue Jul 26 23:40:20 2011
New Revision: 1151296

URL: http://svn.apache.org/viewvc?rev=1151296&view=rev
Log:
release.py: General cleanup.

* tools/dist/release.py
  (sig_pattern): Remove.
  (grab_sig_ids, generate_output): Remove.
  (check_sigs): Fold functionality from above into this function.

Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1151296&r1=1151295&r2=1151296&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Jul 26 23:40:20 2011
@@ -575,10 +575,11 @@ def write_announcement(args):
 # Validate the signatures for a release
 
 key_start = '-----BEGIN PGP SIGNATURE-----\n'
-sig_pattern = re.compile(r'^gpg: Signature made .*? using \w+ key ID (\w+)')
 fp_pattern = re.compile(r'^pub\s+(\w+\/\w+)[^\n]*\n\s+Key\sfingerprint\s=((\s+[0-9A-F]{4}){10})\nuid\s+([^<\(]+)\s')
 
-def grab_sig_ids(args):
+def check_sigs(args):
+    'Check the signatures for the release.'
+
     import gnupg
     gpg = gnupg.GPG()
 
@@ -607,9 +608,6 @@ def grab_sig_ids(args):
                 sys.stderr.write("BAD SIGNATURE for %s\n" % filename)
                 sys.exit(1)
 
-    return good_sigs
-
-def generate_output(good_sigs):
     for id in good_sigs.keys():
         gpg = subprocess.Popen(['gpg', '--fingerprint', id],
                                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -627,11 +625,6 @@ def generate_output(good_sigs):
         print("   %s [%s] with fingerprint:" % (fp[3], fp[0]))
         print("   %s" % fp[1])
 
-def check_sigs(args):
-    'Check the signatures for the release.'
-
-    generate_output(grab_sig_ids(args))
-
 
 #----------------------------------------------------------------------
 # Main entry point for argument parsing and handling