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

[ju...@apache.org]

Author: julianfoad
Date: Tue Jul 23 08:29:56 2019
New Revision: 1863612

URL: http://svn.apache.org/viewvc?rev=1863612&view=rev
Log:
Fix release.py check-sigs/write-downloads: 1.9.1 matched also 1.9.10, etc.

* tools/dist/release.py
  (get_fileinfo): Tighten the version-match glob expression.
  (check_sigs): Use get_fileinfo() instead of its own glob expression.

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=1863612&r1=1863611&r2=1863612&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Jul 23 08:29:56 2019
@@ -1026,7 +1026,7 @@ def get_fileinfo(args):
 
     target = get_target(args)
 
-    files = glob.glob(os.path.join(target, 'subversion*-%s*.asc' % args.version))
+    files = glob.glob(os.path.join(target, 'subversion*-%s.*.asc' % args.version))
     files.sort()
 
     class info(object):
@@ -1117,14 +1117,12 @@ def get_siginfo(args, quiet=False):
         import security._gnupg as gnupg
     gpg = gnupg.GPG()
 
-    target = get_target(args)
-
     good_sigs = {}
     fingerprints = {}
     output = []
 
-    glob_pattern = os.path.join(target, 'subversion*-%s*.asc' % args.version)
-    for filename in glob.glob(glob_pattern):
+    for fileinfo in get_fileinfo(args):
+        filename = os.path.join(get_target(args), fileinfo.filename + '.asc')
         text = open(filename).read()
         keys = text.split(key_start)