[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.10-88-g78a8ce9

X2Go dev team git-admin at x2go.org
Fri Nov 23 11:15:30 CET 2012


The branch, master has been updated
       via  78a8ce92518502a16c909b84a7987e1a3f858523 (commit)
      from  1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 (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 78a8ce92518502a16c909b84a7987e1a3f858523
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 11:14:58 2012 +0100

    Before suspending/terminating a session, make sure that the list of shared folders is up-to-date.

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

Summary of changes:
 debian/changelog |    2 ++
 x2go/client.py   |    8 ++++++++
 x2go/session.py  |    1 +
 3 files changed, 11 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 156035b..469efd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       condition).
     - Consolidating management of shared and unshared client-side
       folders.
+    - Before suspending/terminating a session, make sure that the list of
+      shared folders is up-to-date.
   * /debian/rules:
     + Allow package build on systems with missing dh_python2.
   * /debian/control:
diff --git a/x2go/client.py b/x2go/client.py
index 142e970..8619e26 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1563,6 +1563,10 @@ class X2goClient(object):
         """
         try:
             if session_name is None:
+
+                # make sure that the current list of shared folders is up-to-date before the session suspends
+                self.get_shared_folders(session_uuid, check_list_mounts=True)
+
                 return self.session_registry(session_uuid).suspend(**sessionopts)
             else:
                 for session in self.session_registry.running_sessions():
@@ -1605,6 +1609,10 @@ class X2goClient(object):
         """
         try:
             if session_name is None:
+
+                # make sure that the current list of shared folders is up-to-date before the session terminates
+                self.get_shared_folders(session_uuid, check_list_mounts=True)
+
                 return self.session_registry(session_uuid).terminate(**sessionopts)
             else:
                 for session in self.session_registry.running_sessions() + self.session_registry.suspended_sessions():
diff --git a/x2go/session.py b/x2go/session.py
index 752a5a7..a511ed9 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -2572,6 +2572,7 @@ class X2goSession(object):
         """
         if self.has_terminal_session():
             if self.is_folder_sharing_available() and self.is_master_session():
+
                 if force_all:
                     retval = self.terminal_session.unshare_all_local_folders()
                     if retval:


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