[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-112-g30887ea

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:26:49 CET 2014


The branch, build-baikal has been updated
       via  30887eac5d754a14b9baab46d8d42b10f402b612 (commit)
      from  84683b883de5c853506c116d715f8c054de4a2bf (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/terminal/_stdout.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 4af12c9..cb190ed 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1115,22 +1115,22 @@ class X2goTerminalSessionSTDOUT(object):
         for stdout_line in stdout.read():
             try:
                 _new_value = stdout_line.split("=")[1].strip()
-                if 'gr_port=' in stdout_line and _new_value != str(session_info.graphics_port):
+                if 'gr_port=' in stdout_line and _new_value != str(self.session_info.graphics_port):
                     try:
-                        session_info.graphics_port = int(_new_value)
+                        self.session_info.graphics_port = int(_new_value)
                         self.logger('re-allocating graphics port for session %s, old server-side port is in use; new graphics port is %s' % (self.session_info, self.session_info.graphics_port), loglevel=log.loglevel_NOTICE)
                     except TypeError:
                         # if the re-allocation fails, this is fatal!!!
-                        raise X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.')
-                elif 'sound_port=' in stdout_line and _new_value != str(session_info.snd_port):
+                        raise x2go_exceptions.X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.')
+                elif 'sound_port=' in stdout_line and _new_value != str(self.session_info.snd_port):
                     try:
-                        session_info.snd_port = int(_new_value)
+                        self.session_info.snd_port = int(_new_value)
                         self.logger('re-allocating sound port for session %s, old server-side port is in use; new sound port is %s' % (self.session_info, self.session_info.snd_port), loglevel=log.loglevel_NOTICE)
                     except TypeError:
                         self.logger('Failed to retrieve new sound port from server for session %s, session will be without sound.' % self.session_info, loglevel=log.loglevel_WARN)
-                elif 'fs_port=' in stdout_line and _new_value != str(session_info.sshfs_port):
+                elif 'fs_port=' in stdout_line and _new_value != str(self.session_info.sshfs_port):
                     try:
-                        session_info.sshfs_port = int(_new_value)
+                        self.session_info.sshfs_port = int(_new_value)
                         self.logger('re-allocating sshfs port for session %s, old server-side port is in use; new sshfs port is %s' % (self.session_info, self.session_info.sshfs_port), loglevel=log.loglevel_NOTICE)
                     except TypeError:
                         self.logger('Failed to retrieve new sshfs port from server for session %s, session will be without client-side folder sharing. Neither will there be X2Go printing nor X2Go MIME box support.' % self.session_info, loglevel=log.loglevel_WARN)


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