openstack/bifrost
Code Issues Proposed changes

Change Zuul change processor to not commit cherry picks

Browse Source 
If git is not setup for the root user, then the cherry pick could
fail as the commit information may not not be present.  In stead,
we pass -n to the cherry pick which prevents the command from
committing changes.
This commit is contained in:
Julia Kreger 2015-04-21 14:15:11 -04:00
parent 33b2e27b05
commit 8cf06ee89f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/ironic-install/files/parse_zuul_changes.py
View File

@ -44,8 +44,8 @@ try:
review_url + "/" + repo_name, ref]
if subprocess.call(command, stdout=True) is 0:
if subprocess.call(
['git', '-C', repo_path, 'cherry-pick', 'FETCH_HEAD'],
stdout=True) is 0:
['git', '-C', repo_path, 'cherry-pick',
'-n', 'FETCH_HEAD'], stdout=True) is 0:
print("Applied %s" % ref)
else:
print("Failed to cherry pick %s on to %s branch %s"