The branch, master has been updated via 152e901ae69f36aa583b8b2d50509e3a9bed0c74 (commit) from cf6f644b5cbbe84d161d8adeae773dc2cb3e497c (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 ----------------------------------------------------------------- commit 152e901ae69f36aa583b8b2d50509e3a9bed0c74 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 25 02:41:09 2011 +0200 Bugfix for: Test for existence of remote home directory on connect. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2go/backends/control/_stdout.py | 6 ++++-- x2go/client.py | 1 + x2go/x2go_exceptions.py | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ba8626b..d5d1e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,14 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 +python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: + - Bugfix for: Test for existence of remote home directory on connect. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 + python-x2go (0.1.1.7-0-x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 542e3fe..5b5b63a 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -493,7 +493,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False if not self.home_exists(): - raise x2go_exceptions.X2goControlSessionException('remote home directory does not exist') + self.disconnect() + raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') return (self.get_transport() is not None) @@ -550,7 +551,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def home_exists(self): - if self._x2go_exec_command('stat -tL "%s"', loglevel=log.loglevel_DEBUG): + (_stdin, _stdout, _stderr) = self._x2go_exec_command('stat -tL "%s"' % self._x2go_remote_home, loglevel=log.loglevel_DEBUG) + if _stdout.read(): return True return False diff --git a/x2go/client.py b/x2go/client.py index 4258b46..4ff7cd1 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1102,6 +1102,7 @@ class X2goClient(object): self.session_registry.register_available_server_sessions(profile_name=self.get_session_profile_name(session_uuid), newly_connected=True, ) + return _success __connect_session = connect_session def disconnect_session(self, session_uuid): diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index 6e142a0..1cd86ca 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -45,6 +45,7 @@ class X2goClientPrintingException(_X2goException): pass class X2goClientSettingsException(_X2goException): pass class X2goSessionException(_X2goException): pass class X2goControlSessionException(_X2goException): pass +class X2goRemoteHomeException(_X2goException): pass class X2goHostKeyException(_X2goException): pass class X2goSSHProxyHostKeyException(_X2goException): pass class X2goTerminalSessionException(_X2goException): pass 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).