[X2go-Commits] python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-21-gb6adff9

[X2go dev team]

The branch, release/0.1.1.x has been updated
       via  b6adff9a57bdb59f184842ba222f3a3f89808aca (commit)
      from  ff1c183ebfc1bee38502dd81f56326221b428000 (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 b6adff9a57bdb59f184842ba222f3a3f89808aca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 17 01:33:42 2011 +0200

    Fix for X2goSession.has_terminated method.

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

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 eb43e53..af4ca74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ python-x2go (0.1.1.5-0~x2go1) UNRELEASED; 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 ca4f419..2f14082 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 9428278..9d30221 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).