From b3ae0be37f0aa83bc9ce9bb3d308cc81d297746e Mon Sep 17 00:00:00 2001 From: Ross McDonald Date: Tue, 15 Mar 2016 12:20:15 -0500 Subject: [PATCH] Fixed bug with release candidate being applied to tar and zips. --- build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index e9d674374b0..1b02ba54830 100755 --- a/build.py +++ b/build.py @@ -531,6 +531,10 @@ def build_packages(build_output, version, nightly=False, rc=None, iteration=1): package_build_root = build_root current_location = build_output[platform][arch] + if rc is not None: + # Set iteration to 0 since it's a release candidate + package_iteration = "0.rc{}".format(rc) + if package_type in ['zip', 'tar']: # For tars and zips, start the packaging one folder above # the build root (to include the package name) @@ -552,10 +556,6 @@ def build_packages(build_output, version, nightly=False, rc=None, iteration=1): elif package_type == 'zip': current_location = os.path.join(current_location, name + '.zip') - if rc is not None: - # Set iteration to 0 since it's a release candidate - package_iteration = "0.rc{}".format(rc) - fpm_command = "fpm {} --name {} -a {} -t {} --version {} --iteration {} -C {} -p {} ".format( fpm_common_args, name,