[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0343db23396f4820c0b01fa2095a4032eed92a79
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:25:42 CET 2014
The branch, build-baikal has been updated
via 0343db23396f4820c0b01fa2095a4032eed92a79 (commit)
from 94a1c67fd23e14bdd286573d8565af348f4c5c4e (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 | 3 ++-
x2go/backends/profiles/_file.py | 2 +-
x2go/backends/terminal/_stdout.py | 17 +++++------------
x2go/forward.py | 10 +++++-----
x2go/session.py | 2 +-
x2go/utils.py | 3 +++
6 files changed, 17 insertions(+), 20 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 5c5c91c..dd9af27 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -457,7 +457,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""
return self.resume(**kwargs)
- def resume(self, session_name=None, **kwargs):
+ def resume(self, session_name=None, session_instance=None, **kwargs):
"""\
Resume a running/suspended X2go session.
@@ -483,6 +483,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
list_backend=self._list_backend,
proxy_backend=self._proxy_backend,
client_rootdir=self.client_rootdir,
+ session_instance=session_instance,
sessions_rootdir=self.sessions_rootdir,
**kwargs)
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 4c4ea2c..c9c2064 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -72,7 +72,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
for key, default_value in self.defaultSessionProfile.iteritems():
if not self.iniConfig.has_option(session_profile, key):
self._storeValue(session_profile, key, default_value)
-
+
def __call__(self, profile_id_or_name):
"""\
STILL UNDOCUMENTED
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index e9c2342..54ab518 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -345,13 +345,6 @@ class X2goTerminalSessionSTDOUT(object):
else:
raise OSError, e
- def set_session_instance(self, session_instance):
- """\
- STILL UNDOCUMENTED
-
- """
- self.session_instance = session_instance
-
def get_session_name(self):
"""\
STILL UNDOCUMENTED
@@ -570,7 +563,7 @@ class X2goTerminalSessionSTDOUT(object):
self.logger('no folder name given...', log.loglevel_WARN)
return False
- if type(folder_name) is not types.StringType:
+ if type(folder_name) not in (types.StringType, types.UnicodeType):
self.logger('folder name needs to be of type StringType...', log.loglevel_WARN)
return False
@@ -815,10 +808,10 @@ class X2goTerminalSessionSTDOUT(object):
# set up SSH tunnel for X11 graphical elements
self.proxy = self.proxy_backend(session_info=self.session_info,
- ssh_transport=self.control_session.get_transport(),
- sessions_rootdir=self.sessions_rootdir,
- session_instance=self.session_instance,
- logger=self.logger)
+ ssh_transport=self.control_session.get_transport(),
+ sessions_rootdir=self.sessions_rootdir,
+ session_instance=self.session_instance,
+ logger=self.logger)
self.proxy_subprocess = self.proxy.start_proxy()
self.active_threads.append(self.proxy)
diff --git a/x2go/forward.py b/x2go/forward.py
index 74378a9..13e6651 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -97,7 +97,7 @@ class X2goFwServer(StreamServer):
repr(e)), loglevel=log.loglevel_ERROR)
if self.chan is None:
- self.logger('incoming request to %s:%d was rejected by the SSH server.' %
+ self.logger('incoming request to [%s]:%d was rejected by the SSH server.' %
(self.chain_host, self.chain_port), loglevel=log.loglevel_ERROR)
if self.session_instance:
self.session_instance.HOOK_forwarding_tunnel_setup_failed(chain_host=self.chain_host, chain_port=self.chain_port)
@@ -165,10 +165,10 @@ def start_forward_tunnel(local_host='localhost', local_port=22022,
"""
try:
- fw_server = X2goFwServer(listener=(local_host, local_port),
- remote_host=remote_host, remote_port=remote_port,
- ssh_transport=ssh_transport, session_instance=session_instance,
- logger=logger,
+ fw_server = X2goFwServer(listener=(local_host, local_port),
+ remote_host=remote_host, remote_port=remote_port,
+ ssh_transport=ssh_transport, session_instance=session_instance,
+ logger=logger,
)
try:
fw_server.start()
diff --git a/x2go/session.py b/x2go/session.py
index a96b500..c1a896e 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -632,9 +632,9 @@ class X2goSession(object):
if self.is_alive():
_control = self.control_session
_terminal = _control.resume(session_name=self.session_name,
+ session_instance=self,
logger=self.logger, **self.terminal_params)
self.terminal_session = _terminal
- self.terminal_session.set_session_instance(self)
if self.session_name is None:
_new_session = True
diff --git a/x2go/utils.py b/x2go/utils.py
index 4f3aef5..fedc385 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -189,6 +189,9 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
del _params['fstunnel']
+ if _params.has_key('share_local_folders'):
+ _params['share_local_folders'] = _params['share_local_folders'].split(',')
+
if not _options['fullscreen']:
_params['geometry'] = '%sx%s' % (_options['width'], _options['height'])
else:
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