Author: hwright
Date: Mon Jun 27 17:44:05 2011
New Revision: 1140248
URL: http://svn.apache.org/viewvc?rev=1140248&view=rev
Log:
release.py: Add a new helper which fixes a parsing bug and removes code
duplication.
* tools/dist/release.py
(split_version): New.
(roll_tarballs, post_candidates, write_news): Use helper.
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=1140248&r1=1140247&r2=1140248&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Jun 27 17:44:05 2011
@@ -108,6 +108,13 @@ def download_file(url, target):
target_file = open(target, 'w')
target_file.write(response.read())
+def split_version(version):
+ parts = version.split('-')
+ if len(parts) == 1:
+ return (version, None)
+
+ return (parts[0], parts[1])
+
#----------------------------------------------------------------------
# Cleaning up the environment
@@ -259,8 +266,7 @@ def build_env(base_dir, args):
def roll_tarballs(base_dir, args):
'Create the release artifacts.'
extns = ['zip', 'tar.gz', 'tar.bz2']
- version_base = args.version.split('-')[0]
- version_extra = args.version.split('-')[1]
+ (version_base, version_extra) = split_version(args.version)
if args.branch:
branch = args.branch
@@ -342,8 +348,7 @@ def roll_tarballs(base_dir, args):
def post_candidates(base_dir, args):
'Post the generated tarballs to web-accessible directory.'
- version_base = args.version.split('-')[0]
- version_extra = args.version.split('-')[1]
+ (version_base, version_extra) = split_version(args.version)
if args.target:
target = args.target
@@ -388,8 +393,7 @@ def post_candidates(base_dir, args):
def write_news(base_dir, args):
'Write text for the Subversion website.'
- version_base = args.version.split('-')[0]
- version_extra = args.version.split('-')[1]
+ (version_base, version_extra) = split_version(args.version)
data = { 'date' : datetime.date.today().strftime('%Y%m%d'),
'date_pres' : datetime.date.today().strftime('%Y-%m-%d'),
