Qinusty pushed to branch Qinusty/531-fetch-retries-on-terminate at BuildStream / buildstream
Commits:
3 changed files:
- buildstream/_scheduler/jobs/job.py
- doc/examples/autotools/project.conf
- doc/examples/junctions/autotools/project.conf
Changes:
... | ... | @@ -250,7 +250,7 @@ class Job(): |
250 | 250 |
#
|
251 | 251 |
def resume(self, silent=False):
|
252 | 252 |
if self._suspended:
|
253 |
- if not silent:
|
|
253 |
+ if not silent and not self._scheduler.terminated:
|
|
254 | 254 |
self.message(MessageType.STATUS,
|
255 | 255 |
"{} resuming".format(self.action_name))
|
256 | 256 |
|
... | ... | @@ -549,7 +549,7 @@ class Job(): |
549 | 549 |
#
|
550 | 550 |
self._retry_flag = returncode not in (RC_OK, RC_PERM_FAIL)
|
551 | 551 |
|
552 |
- if self._retry_flag and (self._tries <= self._max_retries):
|
|
552 |
+ if self._retry_flag and (self._tries <= self._max_retries) and not self._scheduler.terminated:
|
|
553 | 553 |
self.spawn()
|
554 | 554 |
return
|
555 | 555 |
|
... | ... | @@ -10,4 +10,4 @@ element-path: elements |
10 | 10 |
# Define some aliases for the tarballs we download
|
11 | 11 |
aliases:
|
12 | 12 |
alpine: https://gnome7.codethink.co.uk/tarballs/
|
13 |
- gnu: https://ftp.gnu.org/gnu/automake/
|
|
13 |
+ gnu: https://ftpmirror.gnu.org/gnu/automake/
|
... | ... | @@ -10,4 +10,4 @@ element-path: elements |
10 | 10 |
# Define some aliases for the tarballs we download
|
11 | 11 |
aliases:
|
12 | 12 |
alpine: https://gnome7.codethink.co.uk/tarballs/
|
13 |
- gnu: https://ftp.gnu.org/gnu/automake/
|
|
13 |
+ gnu: https://ftpmirror.gnu.org/gnu/automake/
|