The branch, twofactorauth has been updated via f498a467ad41fdc75952717d473fc540eac39d42 (commit) from 08ae756f7a22d1015f054d31adeaf8ed56e9a6ec (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/proxy.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2go/proxy.py b/x2go/proxy.py index 9e7a0e2..e974a91 100644 --- a/x2go/proxy.py +++ b/x2go/proxy.py @@ -42,6 +42,9 @@ if _X2GOCLIENT_OS in ("Windows"): else: import gevent_subprocess as subprocess +from defaults import LOCAL_HOME as _LOCAL_HOME +from defaults import X2GO_SESSION_ROOT as _X2GO_SESSION_ROOT + class X2goProxy(threading.Thread): """\ @@ -163,12 +166,12 @@ class X2goProxy(threading.Thread): # update the proxy port in PROXY_ARGS self._update_local_proxy_socket(local_graphics_port) - if len(",".join(self.PROXY_OPTIONS)) >= 250: + if (X2GOCLIENT_OS == "Windows") and (len(",".join(self.PROXY_OPTIONS)) >= 250): _options_filename = os.path.join(self.session_info.local_container, 'options') options = open(_options_filename, 'w') options.write(','.join(self.PROXY_OPTIONS)) options.close() - self.PROXY_OPTIONS= [ 'nx/nx', 'options=%s' % (_options_filename), ] + self.PROXY_OPTIONS= [ 'nx/nx', 'options=%s' % os.path.join(self.session_info.name, 'options'), ] cmd_line = [ self.PROXY_CMD, ] cmd_line.append(self.PROXY_MODE) @@ -224,12 +227,13 @@ class X2goNX3Proxy(X2goProxy): X2goProxy.__init__(self, *args, **kwargs) # setting some default environment variables, nxproxy paths etc. - if sys.platform == "win32": + if _X2GOCLIENT_OS == "Windows": self.PROXY_CMD = os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")) else: self.PROXY_CMD = "/usr/bin/nxproxy" self.PROXY_ENV.update({ - "NX_CLIENT" : "/bin/true", + "NX_CLIENT": "/bin/true", + "NX_ROOT": os.path.join(_LOCAL_HOME, _X2GO_SESSION_ROOT) }) self.PROXY_MODE = '-S' self.PROXY_OPTIONS = [ 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).