openstack
/
releases
Code Issues Proposed changes

Merge "new-branch: Add check for branch name before adding"

This commit is contained in:
Jenkins 2017-09-18 13:32:48 +00:00 committed by Gerrit Code Review
parent 4d6084459f eeeea1a37a
commit 6da20598ce
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openstack_releases/cmds/new_release.py
View File

@ -244,11 +244,24 @@ def main():
'version': new_version,
'projects': projects,
})
if add_stable_branch:
deliverable_info.setdefault('branches', []).append({
'name': 'stable/{}'.format(series),
'location': new_version,
})
branch_name = 'stable/{}'.format(series)
# First check if this branch is already defined
if 'branches' in deliverable_info:
for branch in deliverable_info['branches']:
if branch.get('name') == branch_name:
print('Branch {} already existes, skipping'.format(
branch_name))
add_stable_branch = False
break
if add_stable_branch:
deliverable_info.setdefault('branches', []).append({
'name': branch_name,
'location': new_version,
})
if changes > 0:
deliverable_filename = 'deliverables/%s/%s.yaml' % (