[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-69-g40b2d08

[X2go dev team]

The branch, master has been updated
       via  40b2d08d1101d40402557c15b00c6ac5ddf3641b (commit)
      from  f1ac3a146b79e59af318a2d4c8618a77494286b4 (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 40b2d08d1101d40402557c15b00c6ac5ddf3641b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 2 12:28:24 2011 +0100

    Fix exception raisal in X2goTerminalSessionSTDOUT.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    1 +
 x2go/backends/terminal/_stdout.py |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fa446bf..da4fc78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
 
   * New upstream version (0.1.1.9), bugfix release for 0.1.1.x series:
     - Ignore session registry exceptions for profiles that just got disconnected.
+    - Fix exception raisal in X2goTerminalSessionSTDOUT.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 10:54:23 +0200
 
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 7289d80..529ffa9 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -322,7 +322,7 @@ class X2goTerminalSessionSTDOUT(object):
             if self.session_info.name:
                 self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
             else:
-                raise X2goTerminalSessionException('no valid session info availble')
+                raise x2go_exceptions.X2goTerminalSessionException('no valid session info availble')
         else:
             self.session_info = info_backend()
 
@@ -939,9 +939,9 @@ class X2goTerminalSessionSTDOUT(object):
                                          hostname=self.control_session.get_transport().getpeername(),
                                         )
         except ValueError:
-            raise X2goTerminalSessionException("failed to start X2go session")
+            raise x2go_exceptions.X2goTerminalSessionException("failed to start X2go session")
         except IndexError:
-            raise X2goTerminalSessionException("failed to start X2go session")
+            raise x2go_exceptions.X2goTerminalSessionException("failed to start X2go session")
 
         # local path may be a Windows path, so we use the path separator of the local system
         self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)


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).