Fixing retry/until logic and default value for retries

Fixes #12928
Fixes #12929
This commit is contained in:
James Cammarata 2015-10-27 15:35:56 -04:00
parent 57fe0d6aed
commit 3fc2209ca0
2 changed files with 6 additions and 3 deletions

View file

@ -325,8 +325,11 @@ class TaskExecutor:
self._task.args = dict((i[0], i[1]) for i in iteritems(self._task.args) if i[1] != omit_token)
# Read some values from the task, so that we can modify them if need be
retries = self._task.retries
if retries <= 0:
if self._task.until is not None:
retries = self._task.retries
if retries <= 0:
retries = 1
else:
retries = 1
delay = self._task.delay