[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-23-g45ef555
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:41 CET 2014
The branch, build-baikal has been updated
via 45ef555923e37f73ec2465d3825e8e5b88d1c02b (commit)
from 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 (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:
debian/changelog | 1 +
x2go/backends/control/_stdout.py | 2 --
x2go/session.py | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 06a5979..046e34a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low
terminal session.
- Stabilize sshfs related problems in case remote user is not in fuse group.
- Do not ignore usekbd session profile option anymore, closes upstream issue #81.
+ - Fix for X2goSession.has_terminated method.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 475ab43..5689e27 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -796,7 +796,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""
session_infos = self.list_sessions()
-
if session_name not in session_infos.keys():
if session_name in self.terminated_terminals:
return True
@@ -805,7 +804,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
if session_name in self.associated_terminals.keys():
self.terminate(session_name)
return True
-
return False
def suspend(self, session_name):
diff --git a/x2go/session.py b/x2go/session.py
index aa421d8..9ac086b 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1378,7 +1378,7 @@ class X2goSession(object):
self.faulty = False
if self.virgin and not self.terminated:
self.terminated = None
- return self.has_terminated
+ return self.terminated
__has_terminated = has_terminated
def share_local_folder(self, folder_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).
More information about the x2go-commits
mailing list