From 3f77d559d066ea7d7a01058716bf0dde81dcc074 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 10 Mar 2016 15:56:59 -0600 Subject: [PATCH] Add PLAIN default for branch|project-compare-type The docs indicate that branch and project compare type default to PLAIN - but the code dies when it's attempted. Add in default fallbacks. Change-Id: I55edb8e12f89c7972917e1baef7ad6141eb2f153 --- jenkins_jobs/modules/triggers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index e69d60dca..095b30221 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -454,7 +454,8 @@ def gerrit(parser, xml_parent, data): 'com.sonyericsson.hudson.plugins.gerrit.' 'trigger.hudsontrigger.data.GerritProject') XML.SubElement(gproj, 'compareType').text = get_compare_type( - 'project-compare-type', project['project-compare-type']) + 'project-compare-type', project.get( + 'project-compare-type', 'PLAIN')) XML.SubElement(gproj, 'pattern').text = project['project-pattern'] branches = XML.SubElement(gproj, 'branches') @@ -472,14 +473,16 @@ def gerrit(parser, xml_parent, data): logger.warn(warning) if not project_branches: project_branches = [ - {'branch-compare-type': project['branch-compare-type'], + {'branch-compare-type': project.get( + 'branch-compare-type', 'PLAIN'), 'branch-pattern': project['branch-pattern']}] for branch in project_branches: gbranch = XML.SubElement( branches, 'com.sonyericsson.hudson.plugins.' 'gerrit.trigger.hudsontrigger.data.Branch') XML.SubElement(gbranch, 'compareType').text = get_compare_type( - 'branch-compare-type', branch['branch-compare-type']) + 'branch-compare-type', branch.get( + 'branch-compare-type', 'PLAIN')) XML.SubElement(gbranch, 'pattern').text = branch['branch-pattern'] project_file_paths = project.get('file-paths', [])