summaryrefslogtreecommitdiff
path: root/buildstream/_scheduler
diff options
context:
space:
mode:
Diffstat (limited to 'buildstream/_scheduler')
-rw-r--r--buildstream/_scheduler/jobs/job.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/_scheduler/jobs/job.py b/buildstream/_scheduler/jobs/job.py
index c339a333b..922ce5613 100644
--- a/buildstream/_scheduler/jobs/job.py
+++ b/buildstream/_scheduler/jobs/job.py
@@ -250,7 +250,7 @@ class Job():
#
def resume(self, silent=False):
if self._suspended:
- if not silent:
+ if not silent and not self._scheduler.terminated:
self.message(MessageType.STATUS,
"{} resuming".format(self.action_name))
@@ -549,7 +549,7 @@ class Job():
#
self._retry_flag = returncode not in (RC_OK, RC_PERM_FAIL)
- if self._retry_flag and (self._tries <= self._max_retries):
+ if self._retry_flag and (self._tries <= self._max_retries) and not self._scheduler.terminated:
self.spawn()
return