[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 5df89cef04909ce141d1447129d04dc801a46946

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:38 CEST 2013


The branch, twofactorauth has been updated
       via  5df89cef04909ce141d1447129d04dc801a46946 (commit)
      from  056f7f11a7cf6888fc659b0e169571ebcb97f8d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/proxy/base.py |    8 +++++---
 x2go/backends/proxy/nx3.py  |    6 +++---
 x2go/client.py              |    1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 5836a57..915c923 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -98,7 +98,6 @@ class X2goProxyBASE(threading.Thread):
 
         threading.Thread.__init__(self)
         self.daemon = True
-        self._keepalive = True
 
     def __del__(self):
         """\
@@ -140,6 +139,7 @@ class X2goProxyBASE(threading.Thread):
         gets started here and is forked into background (Greenlet/gevent).
 
         """
+        self._keepalive = True
         self.proxy = None
         if self.session_info is None or self.ssh_transport is None:
             return None
@@ -169,10 +169,12 @@ class X2goProxyBASE(threading.Thread):
         self.session_log_stderr = open('%s/%s' % (self.session_info.local_container, self.session_log, ), 'a')
         self.logger('forking threaded subprocess: %s' % " ".join(cmd_line), log.loglevel_DEBUG)
 
+        print self.PROXY_ENV
         while not self.proxy:
             gevent.sleep(.2)
             p = self.proxy = subprocess.Popen(cmd_line,
-                                              env=self.PROXY_ENV, 
+                                              env=self.PROXY_ENV,
+                                              stdin=subprocess.PIPE,
                                               stdout=self.session_log_stdout,
                                               stderr=self.session_log_stderr,
                                               shell=False)
@@ -180,7 +182,7 @@ class X2goProxyBASE(threading.Thread):
         while self._keepalive:
             gevent.sleep(.5)
 
-        p.terminate()
+        p.stdin.close()
 
     def _update_local_proxy_socket(self, port):
         pass
diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py
index 274288d..01eee7d 100644
--- a/x2go/backends/proxy/nx3.py
+++ b/x2go/backends/proxy/nx3.py
@@ -105,13 +105,13 @@ class X2goProxyNX3(base.X2goProxyBASE):
 
     def _generate_cmdline(self):
 
-        if (_X2GOCLIENT_OS == "Windows") and (len(",".join(self.PROXY_OPTIONS)) >= 250):
+        if _X2GOCLIENT_OS == "Windows":
             _options_filename = os.path.join(self.session_info.local_container, 'options')
             options = open(_options_filename, 'w')
             options.write('%s:%s' % (','.join(self.PROXY_OPTIONS), self.PROXY_DISPLAY))
             options.close()
-            self.PROXY_OPTIONS= [ 'nx/nx', 'options=%s' % os.path.join(".", "..", "S-%s" % self.session_info.name, 'options'), ]
-
+            self.PROXY_OPTIONS= [ 'nx/nx', 'options=%s' % os.path.join("\\", "..", "S-%s" % self.session_info.name, 'options'), ]
+            
         cmd_line = [ self.PROXY_CMD, ]
         cmd_line.append(self.PROXY_MODE)
         _proxy_options = "%s:%s" % (",".join(self.PROXY_OPTIONS), self.PROXY_DISPLAY)
diff --git a/x2go/client.py b/x2go/client.py
index 5480e30..07a2938 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -121,6 +121,7 @@ import uuid
 import copy
 import sys
 import types
+import os
 
 # Python X2go modules
 from settings import X2goClientSettings


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list