[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 314d4725e6ca95d04ffef46145263b6086495ee6
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:19:28 CET 2014
The branch, brokerclient has been updated
via 314d4725e6ca95d04ffef46145263b6086495ee6 (commit)
from f498a467ad41fdc75952717d473fc540eac39d42 (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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/proxy.py b/x2go/proxy.py
index e974a91..195f0d0 100644
--- a/x2go/proxy.py
+++ b/x2go/proxy.py
@@ -43,7 +43,7 @@ else:
import gevent_subprocess as subprocess
from defaults import LOCAL_HOME as _LOCAL_HOME
-from defaults import X2GO_SESSION_ROOT as _X2GO_SESSION_ROOT
+from defaults import X2GO_SESSION_ROOTDIR as _X2GO_SESSION_ROOTDIR
class X2goProxy(threading.Thread):
@@ -233,7 +233,7 @@ class X2goNX3Proxy(X2goProxy):
self.PROXY_CMD = "/usr/bin/nxproxy"
self.PROXY_ENV.update({
"NX_CLIENT": "/bin/true",
- "NX_ROOT": os.path.join(_LOCAL_HOME, _X2GO_SESSION_ROOT)
+ "NX_ROOT": os.path.join(_LOCAL_HOME, _X2GO_SESSION_ROOTDIR)
})
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).
More information about the x2go-commits
mailing list