Merge bug 925285 to production. production-0.8 FENNEC_26_0b1_BUILD1 FENNEC_26_0b1_RELEASE
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 28 Oct 2013 09:06:36 -0400
branchproduction-0.8
changeset 896 12d5a63423f92aee33f03b50a2e1c9296ee78afc
parent 894 b3f5cacf621041a57ff9fa9ab3d43d93b7c5a2b0 (current diff)
parent 895 b4673f1f2a866400ed43e7c2b14607a610090f62 (diff)
child 897 6425f8b7186b186a75e757a1db712b500f98aed7
push id662
push userbhearsum@mozilla.com
push dateMon, 28 Oct 2013 13:06:43 +0000
bugs925285
Merge bug 925285 to production.
--- a/master/buildbot/process/buildstep.py
+++ b/master/buildbot/process/buildstep.py
@@ -861,17 +861,18 @@ class BuildStep:
                 # This should only happen if we've been interrupted
                 assert self.stopped
 
     def finished(self, results):
         if self.stopped:
             # We handle this specially because we don't care about
             # the return code of an interrupted command; we know
             # that this should just be exception due to interrupt
-            results = EXCEPTION
+            if results not in (RETRY, CANCELLED):
+                results = EXCEPTION
             self.step_status.setText(self.describe(True) +
                                  ["interrupted"])
             self.step_status.setText2(["interrupted"])
         if self.progress:
             self.progress.finish()
         self.step_status.stepFinished(results)
         self.releaseLocks()
         self.deferred.callback(results)