From 8cf06ee89f71d43adfa8e589af1b69849f664351 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 21 Apr 2015 14:15:11 -0400 Subject: [PATCH] Change Zuul change processor to not commit cherry picks 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. --- playbooks/roles/ironic-install/files/parse_zuul_changes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/ironic-install/files/parse_zuul_changes.py b/playbooks/roles/ironic-install/files/parse_zuul_changes.py index ef4f27025..09f89599c 100755 --- a/playbooks/roles/ironic-install/files/parse_zuul_changes.py +++ b/playbooks/roles/ironic-install/files/parse_zuul_changes.py @@ -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"