[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.0.3-43-gff2be38
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:26:33 CET 2014
The branch, build-baikal has been updated
via ff2be3893729257f9e03ef61a743ef3b8dd9cc2c (commit)
from 51fcf9104c866bb962277925a6c451a5854d71a1 (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 | 8 +++++---
x2go/session.py | 2 --
2 files changed, 5 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 83bf13e..5b53e5a 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -328,7 +328,7 @@ class X2goTerminalSessionSTDOUT(object):
def _x2go_tidy_up(self):
- if self.proxy is not None:
+ if self.proxy.ok():
self.release_proxy()
try:
@@ -921,7 +921,8 @@ class X2goTerminalSessionSTDOUT(object):
@rtype: bool
"""
- self.release_proxy()
+ if self.proxy.ok():
+ self.release_proxy()
self.control_session.suspend(session_name=self.session_info.name)
# TODO: check if session has really suspended
@@ -937,7 +938,8 @@ class X2goTerminalSessionSTDOUT(object):
@rtype: bool
"""
- self.release_proxy()
+ if self.proxy.ok()
+ self.release_proxy()
self.control_session.terminate(session_name=self.session_info.name)
# TODO: check if session has really suspended
diff --git a/x2go/session.py b/x2go/session.py
index 3a821bd..02d78f4 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1314,7 +1314,5 @@ class X2goSession(object):
"""
if self.has_terminal_session():
- self.terminal_session.release_proxy()
- if self.has_terminal_session():
self.terminal_session.__del__()
self.terminal_session = None
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