From 7372068a723f1a9d1b4a9f3d39e4e74385bbe013 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Tue, 22 Sep 2015 16:51:23 -0400 Subject: [PATCH] fix skipping builds with custom-git Custom git triggers don't necessarily have commit info available. Our code reading the commit message was under the assumption that it would always be there. --- buildtrigger/triggerutil.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildtrigger/triggerutil.py b/buildtrigger/triggerutil.py index 40c1a7bde..b60f38620 100644 --- a/buildtrigger/triggerutil.py +++ b/buildtrigger/triggerutil.py @@ -71,8 +71,11 @@ def find_matching_branches(config, branches): return branches -def should_skip_commit(message): - return '[skip build]' in message or '[build skip]' in message +def should_skip_commit(metadata): + if 'commit_info' in metadata: + message = metadata['commit_info']['message'] + return '[skip build]' in message or '[build skip]' in message + return False def raise_if_skipped_build(prepared_build, config): @@ -93,7 +96,7 @@ def raise_if_skipped_build(prepared_build, config): raise SkipRequestException() # Check the commit message. - if should_skip_commit(prepared_build.metadata['commit_info']['message']): + if should_skip_commit(prepared_build.metadata): logger.debug('Skipping request due to commit message request') raise SkipRequestException()