File fix-format-error-bsc-1043111.patch of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-format-error-bsc-1043111.patch of Package salt (Revision 6373b1a444f7e590de5c63499be2ee8f)

Currently displaying revision 6373b1a444f7e590de5c63499be2ee8f , Show latest

From 27777d873fd6dae0132c56491e5753c9921dcd8a Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Wed, 7 Jun 2017 13:35:29 +0200
Subject: [PATCH] fix format error (bsc#1043111)

---
 salt/client/ssh/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
index a0862d9002..38f5a1f092 100644
--- a/salt/client/ssh/__init__.py
+++ b/salt/client/ssh/__init__.py
@@ -1141,12 +1141,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.
-                        log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr), stderr, retcode)
+                        log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr))
                         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.
-                        log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr), stderr, retcode)
+                        log.error('ERROR: Failure deploying thin, retrying: {0}\n{1}'.format(stdout, stderr))
                 while re.search(RSTR_RE, stdout):
                     stdout = re.split(RSTR_RE, stdout, 1)[1].strip()
                 if self.tty:
-- 
2.12.3

Places

File fix-format-error-bsc-1043111.patch of Package salt (Revision 6373b1a444f7e590de5c63499be2ee8f)

Places