Fixed bug with release candidate being applied to tar and zips.

oldmantaiter · Mar 16, 2016 · b3ae0be · b3ae0be
1 parent 6570da0
commit b3ae0be
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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,