Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C2001200CC6 for ; Tue, 18 Jul 2017 16:40:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C09631654E3; Tue, 18 Jul 2017 14:40:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 09F731654CF for ; Tue, 18 Jul 2017 16:40:54 +0200 (CEST) Received: (qmail 60038 invoked by uid 500); 18 Jul 2017 14:40:54 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 60027 invoked by uid 99); 18 Jul 2017 14:40:54 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2017 14:40:54 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 48A8B3A010E for ; Tue, 18 Jul 2017 14:40:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1802302 - /subversion/trunk/tools/dist/release.py Date: Tue, 18 Jul 2017 14:40:50 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170718144053.48A8B3A010E@svn01-us-west.apache.org> archived-at: Tue, 18 Jul 2017 14:40:56 -0000 Author: danielsh Date: Tue Jul 18 14:40:50 2017 New Revision: 1802302 URL: http://svn.apache.org/viewvc?rev=1802302&view=rev Log: * tools/dist/release.py (post_candidates): De-duplicate the SVN_VER_NUMBER reconstruction logic. 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=1802302&r1=1802301&r2=1802302&view=diff ============================================================================== --- subversion/trunk/tools/dist/release.py (original) +++ subversion/trunk/tools/dist/release.py Tue Jul 18 14:40:50 2017 @@ -593,9 +593,7 @@ 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) + ver = str(args.version) svn_cmd = ['svn', 'import', '-m', 'Add Subversion %s candidate release artifacts' % ver, '--auto-props', '--config-option',