[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.4.0.7-5-g436a770

[X2Go dev team]

The branch, twofactorauth has been updated
       via  436a770160211b9c89abe24a27ceb7ec8b79dc7b (commit)
      from  b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (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 |    2 ++
 x2go/session.py  |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8f78fb2..5417219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low
     - Fix session profile updates with changes to the host parameter.
     - Use the session object's lock to detect if updating the session
       status in the session registry is something appropriate to do.
+    - Do not overwrite not-yet-suspended terminal session objects during
+      session resumption.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 03 Aug 2013 22:32:30 +0200
 
diff --git a/x2go/session.py b/x2go/session.py
index 237e84b..065e85f 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1759,7 +1759,8 @@ class X2GoSession(object):
         @raise Exception: any exception that occurs during published application menu retrieval is passed through
 
         """
-        self.terminal_session = 'PENDING'
+        if self.terminal_session is None:
+            self.terminal_session = 'PENDING'
 
         # initialize a dummy event to avoid many if clauses further down in the code
         self.reset_progress_status()
@@ -1795,6 +1796,7 @@ class X2GoSession(object):
                 try:
 
                     self._suspend()
+                    self.terminal_session = 'PENDING'
 
                     self._progress_status = 10
                     progress_event.set()


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