From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 19 Sep 2011 07:03:03 +0000 (+0200)
Subject: Fix timeout option spec
X-Git-Tag: nepi-3.0.0~225
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6582ac6b094dc7fa2344df49224da9dcb40c4004;p=nepi.git

Fix timeout option spec
---

diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index 4d7d5507..2d15b382 100644
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -589,7 +589,8 @@ def popen_ssh_command(command, host, port, user, agent,
     tmp_known_hosts = None
     args = ['ssh',
             # Don't bother with localhost. Makes test easier
-            '-o', 'NoHostAuthenticationForLocalhost=yes,ConnectTimeout=%s' % (connect_timeout,),
+            '-o', 'NoHostAuthenticationForLocalhost=yes',
+            '-o', 'ConnectTimeout=%d' % (int(connect_timeout),),
             '-l', user, host]
     if agent:
         args.append('-A')