File 0056-Makes-sure-gather_job_timeout-is-an-intege... of Package salt.4663

Overview Repositories Revisions Requests Users Attributes Meta

File 0056-Makes-sure-gather_job_timeout-is-an-integer.patch of Package salt.4663

From 905b22b1bc9a73f6492601eaee90ed2ef8bd001c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Thu, 23 Mar 2017 16:30:52 +0000
Subject: [PATCH 56/57] Makes sure "gather_job_timeout" is an integer

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

diff --git a/salt/client/__init__.py b/salt/client/__init__.py
index 7665cd4..504f5ed 100644
--- a/salt/client/__init__.py
+++ b/salt/client/__init__.py
@@ -193,7 +193,7 @@ class LocalClient(object):
         Return the information about a given job
         '''
         log.debug('Checking whether jid {0} is still running'.format(jid))
-        timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
+        timeout = int(kwargs.get('gather_job_timeout', self.opts['gather_job_timeout']))
 
         pub_data = self.run_job(tgt,
                                 'saltutil.find_job',
@@ -848,7 +848,7 @@ class LocalClient(object):
 
         if timeout is None:
             timeout = self.opts['timeout']
-        gather_job_timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
+        gather_job_timeout = int(kwargs.get('gather_job_timeout', self.opts['gather_job_timeout']))
         start = int(time.time())
 
         # timeouts per minion, id_ -> timeout time
-- 
2.10.1

Places

File 0056-Makes-sure-gather_job_timeout-is-an-integer.patch of Package salt.4663

Places