[X2Go-Commits] [x2goclient] 58/94: Fix --share-local-folders (aka -F) option and really mount shared folders. (Fixes: #984).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.0
in repository x2goclient.

commit e8dacb1ff7ef2435ee68e83b59d91bfb22a04395
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 18:41:38 2018 +0200

    Fix --share-local-folders (aka -F) option and really mount shared folders. (Fixes: #984).
---
 debian/changelog       | 2 ++
 pyhoca/cli/frontend.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0b46a46..1e88d5a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium
     - Add --forward-sshagent / -A cmdline option for enabling SSH agent
       forwarding.
     - Entirely rewrite PyHocaCLI.authenticate() function. (Fixes: #1308).
+    - Fix --share-local-folders (aka -F) option and really mount shared folders.
+      (Fixes: #984).
   * debian/rules:
     + Build for Python3, not Python2.
     + Switch to pybuild DH build system.
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 4d94bf52..01732cfc 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -438,6 +438,8 @@ class PyHocaCLI(x2go.X2GoClient):
             if self.args.xinerama:
                 xinerama = self.args.xinerama
 
+            allow_share_local_folders = bool(self.args.share_local_folders)
+
             # setup up the manually configured X2Go session
             self.x2go_session_hash = self._X2GoClient__register_session(args.server, port=int(self.args.remote_ssh_port),
                                                            known_hosts=ssh_known_hosts_filename,
@@ -458,6 +460,7 @@ class PyHocaCLI(x2go.X2GoClient):
                                                            print_action=self.args.print_action,
                                                            print_action_args=self.args.print_action_args,
                                                            share_local_folders=self.args.share_local_folders,
+                                                           allow_share_local_folders=allow_share_local_folders,
                                                            forward_sshagent=self.args.forward_sshagent,
                                                            cmd=self.args.command)
 
@@ -698,6 +701,9 @@ class PyHocaCLI(x2go.X2GoClient):
                 sleep(1)
                 i+=1
 
+            session = self._X2GoClient__get_session(self.x2go_session_hash)
+            session.set_master_session()
+
             if self._X2GoClient__session_ok(self.x2go_session_hash):
 
                 profile_name = self._X2GoClient__get_session_profile_name(self.x2go_session_hash)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git