Skip to content

Commit

Permalink
fix rc package iteration error
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanielc committed Mar 14, 2016
1 parent 55e25da commit 0b43cc3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,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)
Expand All @@ -572,10 +576,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,
Expand Down

0 comments on commit 0b43cc3

Please sign in to comment.