The branch, build-baikal has been updated via d0258dd143bfb03489bab74618b36d627cbadb35 (commit) from 06780bba84b7165fd251eb916a3e69a09bc456fb (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/defaults.py | 2 +- x2go/proxy.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 3f292ef..5df419c 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -42,7 +42,7 @@ X2GO_CLIENT_ROOTDIR = '.x2goclient' if X2GOCLIENT_OS == "Windows": import win32api CURRENT_LOCAL_USER = win32api.GetUserName() - X2GO_SSH_ROOTDIR = '.x2go/.ssh' + X2GO_SSH_ROOTDIR = os.path.join('.x2go','.ssh') elif X2GOCLIENT_OS == "Linux": import getpass diff --git a/x2go/proxy.py b/x2go/proxy.py index a2c4cc2..20cf0b3 100644 --- a/x2go/proxy.py +++ b/x2go/proxy.py @@ -222,12 +222,13 @@ class X2goNX3Proxy(X2goProxy): self.PROXY_ENV.update({ "NX_CLIENT" : "/bin/true", }) + print 'HALLO: %s' % self.session_info.local_container self.PROXY_ARGS = ["-S", - "nx/nx,root=%s,retry=5," % self.session_info.local_container + + "nx/nx,root='%s',retry=5," % self.session_info.local_container + "composite=1,connect=localhost," + "cookie=%s," % self.session_info.cookie + "port=%d," % self.session_info.graphics_port + - "errors=%s/%s" % (self.session_info.local_container, self.session_log, ), + "errors='%s'" % os.path.join(self.session_info.local_container, self.session_log, ), ] def _update_local_proxy_socket(self, port): 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).