Author: hwright
Date: Thu Jun 16 20:53:06 2011
New Revision: 1136671
URL: http://svn.apache.org/viewvc?rev=1136671&view=rev
Log:
release.py: special case the nightly tarball name (for compat with dist.sh)
and move and calculate checksums all in one step.
* tools/dist/release.py
(roll_tarballs): As above.
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=1136671&r1=1136670&r2=1136671&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu Jun 16 20:53:06 2011
@@ -297,21 +297,21 @@ def roll_tarballs(base_dir, args):
extra_args) )
# Move the results to the deploy directory
- logging.info('Moving resulting artifacts')
+ logging.info('Moving artifacts and calculating checksums')
for e in extns:
- shutil.move('subversion-%s.%s' % (args.version, e),
- get_deploydir(base_dir))
- shutil.move('svn_version.h.dist', get_deploydir(base_dir))
+ if version_extra and version_extra.startswith('nightly'):
+ filename = 'subversion-trunk.%s' % e
+ else:
+ filename = 'subversion-%s.%s' % (args.version, e)
- # Create sha1 sums
- logging.info('Calculating checksums')
- for e in extns:
- filename = os.path.join(get_deploydir(base_dir), 'subversion-%s.%s' %
- (args.version, e))
+ shutil.move(filename, get_deploydir(base_dir))
+ filename = os.path.join(get_deploydir(base_dir), filename)
m = hashlib.sha1()
m.update(open(filename, 'r').read())
open(filename + '.sha1', 'w').write(m.hexdigest())
+ shutil.move('svn_version.h.dist', get_deploydir(base_dir))
+
# And we're done!