[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.6-4-g7f3bb41

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


The branch, build-baikal has been updated
       via  7f3bb41f604c678dd6798636307f0ceeb7297fff (commit)
      from  6d253091c228b3aa3f5bb6f356d5c72e6f2009a1 (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                  |    7 ++-----
 x2go/backends/terminal/_stdout.py |   11 +++++++++++
 x2go/cache.py                     |    6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 98bdaf7..1884948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,7 @@
-python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low
+python-x2go (0.4.0.7-0~x2go2) UNRELEASED; urgency=low
 
-  * New upstream version (0.4.0.7):
-    - Drop duplicate method in terminal backend: is_desktop_session().
   * /debian/control:
-    + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
-
+    - Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 19:48:57 +0200
 
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 4f28311..b1a3f28 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1637,6 +1637,17 @@ class X2GoTerminalSessionSTDOUT(object):
 
             self._cleaned_up = True
 
+    def is_desktop_session(self):
+        """\
+        Test if this terminal session is a desktop session.
+
+        @return: C{True} if this session is of session type desktop ('D').
+        @rtype: C{bool}
+
+        """
+        self.params.rewrite_session_type()
+        return self.params.session_type == 'D'
+
     def is_rootless_session(self):
         """\
         Test if this terminal session is a rootless session.
diff --git a/x2go/cache.py b/x2go/cache.py
index 9fad89d..5998bd3 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -152,9 +152,9 @@ class X2GoListSessionsCache(object):
             self.x2go_listsessions_cache[profile_name]['mounts'] = {}
             if self.x2go_listsessions_cache[profile_name]['sessions']:
                 for session_name in self.x2go_listsessions_cache[profile_name]['sessions']:
-                    #if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running():
-                    if control_session is not None and not control_session.has_session_died():
-                        self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name))
+                    if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running():
+                        if control_session is not None and not control_session.has_session_died():
+                            self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name))
         except (x2go_exceptions.X2GoControlSessionException, AttributeError), e:
             if profile_name in self.x2go_listsessions_cache.keys():
                 del self.x2go_listsessions_cache[profile_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