[pypy-svn] r75718 - pypy/trunk/dotviewer

[antocuni at codespeak.net]

Author: antocuni
Date: Thu Jul  1 16:01:38 2010
New Revision: 75718

Modified:
   pypy/trunk/dotviewer/sshgraphserver.py
Log:
explicitly disable the "control master" option. Else, if ControlMaster is
automatically enabled (e.g. by an option in .ssh/config), and there is already
an active connection, the port forwarding is not setup



Modified: pypy/trunk/dotviewer/sshgraphserver.py
==============================================================================
--- pypy/trunk/dotviewer/sshgraphserver.py	(original)
+++ pypy/trunk/dotviewer/sshgraphserver.py	Thu Jul  1 16:01:38 2010
@@ -21,7 +21,7 @@
     remoteport = random.randrange(10000, 20000)
     #  ^^^ and just hope there is no conflict
 
-    args = ['ssh', '-C', '-R%d:127.0.0.1:%d' % (remoteport, localport)]
+    args = ['ssh', '-S', 'none', '-C', '-R%d:127.0.0.1:%d' % (remoteport, localport)]
     args = args + sshargs + ['python -u -c "exec input()"']
     print ' '.join(args[:-1])
     p = subprocess.Popen(args, bufsize=0,