commit b58820536f5abc249373be1a9b259c1d03c3b4c8
author Monty Taylor <mordred@inaugust.com> Fri Sep 29 19:12:52 2017 -0500
committer Monty Taylor <mordred@inaugust.com> Sat Sep 30 10:03:33 2017 -0500
tree c7ba710d39835f5d80664701303d94e5c18d3c8a
parent 68d3ba566ca622a3ea98531d1d635c802ed6d5e7

Handle build_set being None for priority

There are flows where there is no build_set. In those cases, return
a normal priority.

Also fixes a pep8 error from a force-merge.

Change-Id: I1c98508fe227f7f6aa1d0b2f7dcf270cecaa60d8

zuul/configloader.py

diff --git a/zuul/configloader.py b/zuul/configloader.py
index 97dfd21..62cec36 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -486,7 +486,7 @@
 
         job = model.Job(conf['name'])
         job.source_context = conf.get('_source_context')
-        job.source_line = conf.get('_start_mark').line +1
+        job.source_line = conf.get('_start_mark').line + 1
 
         is_variant = layout.hasJob(conf['name'])
         if 'parent' in conf:

zuul/model.py

diff --git a/zuul/model.py b/zuul/model.py
index eff0ae3..6fe3b94 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -532,7 +532,11 @@
 
     @property
     def priority(self):
-        return PRIORITY_MAP[self.build_set.item.pipeline.precedence]
+        if self.build_set:
+            precedence = self.build_set.item.pipeline.precedence
+        else:
+            precedence = PRECEDENCE_NORMAL
+        return PRIORITY_MAP[precedence]
 
     @property
     def fulfilled(self):