[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-80-gaf2a1f8
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:47 CET 2014
The branch, build-baikal has been updated
via af2a1f81c8b96df6ac049616847e22d99102791b (commit)
from 584c53129bd67f9a4dd7c19f0bbc69f713073eb6 (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/control/_stdout.py | 6 ++++++
x2go/session.py | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 9f2f9a3..0fb0171 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -146,6 +146,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.session_died = False
+ def get_hostname(self):
+ return self.hostname
+
+ def get_port(self):
+ return self.port
+
def load_session_host_keys(self):
if self.known_hosts is not None:
utils.touch_file(self.known_hosts)
diff --git a/x2go/session.py b/x2go/session.py
index fbd4cbd..b6a634f 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -522,7 +522,6 @@ class X2goSession(object):
return self.control_params['username']
__get_username = get_username
-
def user_is_x2gouser(self, username=None):
"""\
Check if a given user is valid server-side X2go user.
@@ -575,7 +574,7 @@ class X2goSession(object):
@rtype: C{str}
"""
- self.server = self.control_session.hostname
+ self.server = self.control_session.get_hostname()
return self.server
__get_server_hostname = get_server_hostname
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