saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

follow up on the re-deploy if there is a checksum missmatch

Browse source
This commit is contained in:
Thomas S Hatch 2016-08-25 14:17:39 -06:00
parent d75005c519
commit 2558dcc100
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/client/ssh/__init__.py
View file

@ -1044,11 +1044,12 @@ ARGS = {10}\n'''.format(self.minion_config,
if not self.tty:
# If RSTR is not seen in both stdout and stderr then there
# was a thin deployment problem.
return 'ERROR: Failure deploying thin: {0}\n{1}'.format(stdout, stderr), stderr, retcode
log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr), stderr, retcode)
return self.cmd_block()
elif not re.search(RSTR_RE, stdout):
# If RSTR is not seen in stdout with tty, then there
# was a thin deployment problem.
return 'ERROR: Failure deploying thin: {0}\n{1}'.format(stdout, stderr), stderr, retcode
log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr), stderr, retcode)
stdout = re.split(RSTR_RE, stdout, 1)[1].strip()
if self.tty:
stderr = ''