From 68dccae5b4ffdc1a7045904f019fa280dc3f29fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Thu, 23 Mar 2017 16:30:52 +0000 Subject: [PATCH] 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 5f40230732..0c8fdd332e 100644 --- a/salt/client/__init__.py +++ b/salt/client/__init__.py @@ -220,7 +220,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', @@ -921,7 +921,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