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

[da...@apache.org]

Author: danielsh
Date: Sun Aug  6 21:15:58 2017
New Revision: 1804277

URL: http://svn.apache.org/viewvc?rev=1804277&view=rev
Log:
release.py: Correct the output of 'write-downloads' to prevent recurrence of
the problem fixed in r1804273.

Reverts r1298552.

* tools/dist/release.py
  (get_sha1info): Remove the codepath that replaces a version number by
    a download.html ezt macro that's supposed to expand to that version
    number again, but sometimes did not, because it should have been
    '[prerelease]' rather than '[version]' for pre-releases (and,
    I suppose, '[supported]' for penultimate-minor-line releases).
    .
    This reverts r1298552, but r1298548 should not be reverted, since
    '[version]' is still used elsewhere in download.html.
  (write_downloads): Update caller.

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=1804277&r1=1804276&r2=1804277&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Sun Aug  6 21:15:58 2017
@@ -784,7 +784,7 @@ def write_news(args):
     template.generate(sys.stdout, data)
 
 
-def get_sha1info(args, replace=False):
+def get_sha1info(args):
     'Return a list of sha1 info for the release'
 
     target = get_target(args)
@@ -798,12 +798,7 @@ def get_sha1info(args, replace=False):
     for s in sha1s:
         i = info()
         # strip ".sha1"
-        fname = os.path.basename(s)[:-5]
-        if replace:
-            # replace the version number with the [version] reference
-            i.filename = Version.regex.sub('[version]', fname)
-        else:
-            i.filename = fname
+        i.filename = os.path.basename(s)[:-5]
         i.sha1 = open(s, 'r').read()
         sha1info.append(i)
 
@@ -846,7 +841,7 @@ def write_announcement(args):
 
 def write_downloads(args):
     'Output the download section of the website.'
-    sha1info = get_sha1info(args, replace=True)
+    sha1info = get_sha1info(args)
 
     data = { 'version'              : str(args.version),
              'fileinfo'             : sha1info,