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

[st...@apache.org]

Author: stsp
Date: Thu Feb 16 14:41:29 2017
New Revision: 1783231

URL: http://svn.apache.org/viewvc?rev=1783231&view=rev
Log:
Fix handling of pre-release version numbers in release.py post-candidates.

* tools/dist/release.py
  (post_candidates): If a pre-release is being posted then include the
    pre-release part of the version number in the commit log message.

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=1783231&r1=1783230&r2=1783231&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu Feb 16 14:41:29 2017
@@ -580,8 +580,11 @@ def post_candidates(args):
     target = get_target(args)
 
     logging.info('Importing tarballs to %s' % dist_dev_url)
+    ver = args.version.base
+    if args.version.pre:
+        ver = "%s-%s%d" % (ver, args.version.pre, args.version.pre_num)
     svn_cmd = ['svn', 'import', '-m',
-               'Add %s candidate release artifacts' % args.version.base,
+               'Add Subversion %s candidate release artifacts' % ver,
                '--auto-props', '--config-option',
                'config:auto-props:*.asc=svn:eol-style=native;svn:mime-type=text/plain',
                target, dist_dev_url]