You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/05/10 19:01:19 UTC
svn commit: r1336795 - /subversion/trunk/tools/dist/release.py
Author: philip
Date: Thu May 10 17:01:19 2012
New Revision: 1336795
URL: http://svn.apache.org/viewvc?rev=1336795&view=rev
Log:
* tools/dist/release.py
(post_candidates, clean_dist, move_to_dist): Only pass username when
given explicitly.
(create-tag): Only pass username when given explicitly, log action.
(main): Remove default --username.
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=1336795&r1=1336794&r2=1336795&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu May 10 17:01:19 2012
@@ -51,7 +51,6 @@ import operator
import itertools
import subprocess
import argparse # standard in Python 2.7
-import getpass
# Find ezt, using Subversion's copy, if there isn't one on the system.
try:
@@ -481,13 +480,14 @@ def post_candidates(args):
'Post candidate artifacts to the dist development directory.'
logging.info('Importing tarballs to %s' % dist_dev_url)
- proc = subprocess.Popen(['svn', 'import', '-m',
- 'Add %s candidate release artifacts'
- % args.version.base,
- '--auto-props', '--config-option',
- 'config:auto-props:*.asc=svn:eol-style=native',
- '--username', args.username,
- get_deploydir(args.base_dir), dist_dev_url])
+ svn_cmd = ['svn', 'import', '-m',
+ 'Add %s candidate release artifacts' % args.version.base,
+ '--auto-props', '--config-option',
+ 'config:auto-props:*.asc=svn:eol-style=native',
+ get_deploydir(args.base_dir), dist_dev_url]
+ if (args.username):
+ svn_cmd += ['--username', args.username]
+ proc = subprocess.Popen(svn_cmd)
(stdout, stderr) = proc.communicate()
proc.wait()
@@ -497,6 +497,8 @@ def post_candidates(args):
def create_tag(args):
'Create tag in the repository'
+ logging.info('Creating tag for %s' % str(args.version))
+
if args.branch:
branch = secure_repos + '/' + args.branch
else:
@@ -506,8 +508,9 @@ def create_tag(args):
tag = secure_repos + '/tags/' + str(args.version)
svnmucc_cmd = ['svnmucc', '-m',
- 'Tagging release ' + str(args.version),
- '--username', args.username]
+ 'Tagging release ' + str(args.version)]
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
svnmucc_cmd += ['cp', str(args.revnum), branch, tag]
svnmucc_cmd += ['put', os.path.join(get_deploydir(args.base_dir),
'svn_version.h.dist'),
@@ -543,8 +546,9 @@ def clean_dist(args):
svnmucc_cmd = ['svnmucc', '-m', 'Remove old Subversion releases.\n' +
'They are still available at ' +
- 'http://archive.apache.org/dist/subversion/',
- '--username', args.username]
+ 'http://archive.apache.org/dist/subversion/']
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
for k, g in itertools.groupby(sorted(versions),
lambda x: (x.major, x.minor)):
releases = list(g)
@@ -579,8 +583,9 @@ def move_to_dist(args):
if fnmatch.fnmatch(entry, 'subversion-%s.*' % str(args.version)):
filenames.append(entry)
svnmucc_cmd = ['svnmucc', '-m',
- 'Publish Subversion-%s.' % str(args.version),
- '--username', args.username]
+ 'Publish Subversion-%s.' % str(args.version)]
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
svnmucc_cmd += ['rm', dist_dev_url + '/' + 'svn_version.h.dist']
for filename in filenames:
svnmucc_cmd += ['mv', dist_dev_url + '/' + filename,
@@ -792,9 +797,8 @@ def main():
subparser.set_defaults(func=post_candidates)
subparser.add_argument('version', type=Version,
help='''The release label, such as '1.7.0-alpha1'.''')
- subparser.add_argument('--username', default=getpass.getuser(),
- help='''Username for ''' + dist_repos + '''. The default
- is the current username''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
# Setup the parser for the create-tag subcommand
subparser = subparsers.add_parser('create-tag',
@@ -806,9 +810,8 @@ def main():
help='''The revision number to base the release on.''')
subparser.add_argument('--branch',
help='''The branch to base the release on.''')
- subparser.add_argument('--username', default=getpass.getuser(),
- help='''Username for ''' + dist_repos + '''. The default
- is the current username''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + secure_repos + '''.''')
# The clean-dist subcommand
subparser = subparsers.add_parser('clean-dist',
@@ -817,9 +820,8 @@ def main():
subparser.set_defaults(func=clean_dist)
subparser.add_argument('--dist-dir',
help='''The directory to clean.''')
- subparser.add_argument('--username', default=getpass.getuser(),
- help='''Username for ''' + dist_repos + '''. The default
- is the current username''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
# The move-to-dist subcommand
subparser = subparsers.add_parser('move-to-dist',
@@ -829,9 +831,8 @@ def main():
subparser.set_defaults(func=move_to_dist)
subparser.add_argument('version', type=Version,
help='''The release label, such as '1.7.0-alpha1'.''')
- subparser.add_argument('--username', default=getpass.getuser(),
- help='''Username for ''' + dist_repos + '''. The default
- is the current username''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
# The write-news subcommand
subparser = subparsers.add_parser('write-news',