x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - release/0.1.1.x (branch) created: 0.1.1.6-2-g6fd557e
by git-admin＠x2go.org 15 Sep '11

15 Sep '11

The branch, release/0.1.1.x has been created at 6fd557ede24430dac8b67b2341152969ad5b1584 (commit) - Log ----------------------------------------------------------------- commit 6fd557ede24430dac8b67b2341152969ad5b1584 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:44:34 2011 +0200 changelog version increment commit 1696e45dd9d579abeb65dcb26a45bde017a1629f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:43:46 2011 +0200 version increment commit c20bb5b5be476562ddb64b7064a375986f8955bb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:38:04 2011 +0200 release version 0.1.1.6 commit a462d315a76b877535aaadc4e799d268e6a4bf29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 16:18:24 2011 +0200 Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. commit 29297e679ea9c13051bd89a037e8d260a5d4b572 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 13 11:35:47 2011 +0200 * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. - Be tolerant against trailing whitespaces in hostnames. commit 18903032511f7a0865600cbb5da78fc9382db069 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 13 11:38:18 2011 +0200 version increment commit 19db0a0ec580c83bd216c6524367c2c7646ea541 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 11 18:42:09 2011 +0200 continue development commit fa3e51faff8c4a00a6beb998dd671d8c3a61e4f1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 11 18:32:21 2011 +0200 release 0.1.1.5 commit df3fab737e8dd0d1cf6a42afc296fed407468284 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 01:21:02 2011 +0200 Catching fautly x2gostartagent behaviour. commit 73cf843144b4363d265b946567e7a4484e335558 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 16:17:59 2011 +0200 Make X2goTerminalSessionSTDOUT.has_command resistable against empty command strings. commit aaea664fff61becb7e1666e2fa16d3db71200447 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 14:47:19 2011 +0200 Fix for executing commands with arguments that contain a slash (thanks to Dick Kniep for digging this out). commit 20a8605bddc3da4b9635ec6532f90c9a972f84ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 13:34:42 2011 +0200 log message fix in x2gosession.py commit b6adff9a57bdb59f184842ba222f3a3f89808aca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 01:33:42 2011 +0200 Fix for X2goSession.has_terminated method. commit ff1c183ebfc1bee38502dd81f56326221b428000 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 00:30:49 2011 +0200 cosmetic fix for share_desktop method commit 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 21:49:49 2011 +0200 typo fix (with impact) commit 0cbb6adeb83487872c9786d3311883c89345bd15 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 21:17:29 2011 +0200 launch the x2goagent+command earlier during session creation... commit 7be509ca50a0767fd13f9a358b18cde3e44a3d0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 16:15:25 2011 +0200 Do not ignore usekbd session profile option anymore, closes upstream issue #81. commit 6fed6846c80b67eeac3c26da70987d63f0371893 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:47:15 2011 +0200 add some logging to failing sshfs sessions commit a5ab9db9661a5b2c9a14055d040f6cc7b7d18dd0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:44:31 2011 +0200 Stabilize sshfs related problems in case remote user is not in fuse group. commit 5ec4f17eec36937131a8154c2c42b6fcba7b6e65 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:36:59 2011 +0200 If sound is set to false in session profile use snd_system='none' in terminal session. commit 65bc84008ddf63ac5d464ccb0f74109eb22d8b84 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:23:01 2011 +0200 changelog update commit 68e33528fd928c7067a18ff0b485cbf0891ec8c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:22:35 2011 +0200 Fix for X2goSessionRegistry.forget method, do not complain if session_uuid is already forgotten. commit 7e65631076b0ba6f57462b000394847d04bcbc0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 15:23:14 2011 +0200 fix for Makefile.docupload commit e68649f2131e414916354a043b2e2280b3288790 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 25 08:23:27 2011 +0200 catching a socket.error exception during command execution commit 7ad69fbf897ef2698ac99a40071cc04da8aaf585 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 23:28:25 2011 +0200 fix for link quality patch commit a22d5eac8b65ec2e8ca6d5f618b8c2e68bdcf873 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 00:29:06 2011 +0200 Renamed/restructured NX compression pack method names. commit aecf8d324f31c87b2a3da85ba337ff36b2e3ce02 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 23:20:30 2011 +0200 remove interpreter from defaults.py commit 75cfc90773e4c62ffd20a1feeb0a4847fc1adb09 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 23:20:20 2011 +0200 version fix in changelog commit ec38cb41810c72bd8e4c5b3013250492a7ce7b17 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 19:38:50 2011 +0200 changelog update commit 7b0ef4d68690a9d764e2b8215588ff760dffd97b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 19:36:09 2011 +0200 Handle full path cmd strings adequately: check existence of full path, but use basename for cmd startup. commit c4d4625165114c0812dde514f7f3cab2cc98da0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 19:35:35 2011 +0200 Call a hook method in case a session startup has failed (was: exception raisal). commit 86ad124c31b84e50f436583f5c66d3f54af567ef Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 20 18:36:37 2011 +0200 tab fix commit 6bf24a099e6af1e564176604d8582c508eec1286 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 19 20:45:03 2011 +0200 version incremenet (0.1.1.x series) ----------------------------------------------------------------------- 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).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-32-g956ae90
by git-admin＠x2go.org 15 Sep '11

15 Sep '11

The branch, master has been updated via 956ae90c84e189d3ef764e36db60d06b47f80fbd (commit) from 019e478b242d2879de567cbcf35d04b0b7a88799 (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 956ae90c84e189d3ef764e36db60d06b47f80fbd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 15 00:13:56 2011 +0200 Add support for x2goumount-session calls. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2go/backends/terminal/_stdout.py | 18 +++++++++++++++ x2go/client.py | 42 +++++++++++++++++++++++++++++++++++++ x2go/session.py | 36 ++++++++++++++++++++++++++++++- 4 files changed, 96 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c5c9f26..8350ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - - continue development... + - Add support for x2goumount-session calls. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 8f00822..c5bbdbc 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -678,6 +678,24 @@ class X2goTerminalSessionSTDOUT(object): (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) self.logger('x2gomountdirs output is : %s' % stdout.read().split('\n'), log.loglevel_NOTICE) + def unshare_all_local_folders(self): + """\ + Unshare all local folders mount in the X2go session. + + @return: returns C{True} if all local folders could be successfully unmounted from the X2go server session + @rtype: bool + + """ + self.logger('unsharing all local folders for session %s' % self.session_info, log.loglevel_INFO) + + cmd_line = [ 'export HOSTNAME &&', + 'x2goumount-session', + self.session_info, + ] + + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + self.logger('x2goumount-session output is : %s' % stdout.read().split('\n'), log.loglevel_NOTICE) + def color_depth(self): """\ Retrieve the session's color depth. diff --git a/x2go/client.py b/x2go/client.py index e589f5a..8316360 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1501,6 +1501,48 @@ class X2goClient(object): return False __share_local_folder_with_session = share_local_folder_with_session + def unshare_all_local_folders_from_session(self, session_uuid=None, folder_name=_LOCAL_HOME, profile_name=None): + """\ + Unshare all local folders mounted in X2go session registered as + C{session_uuid}. + + When calling this method all client-side mounted folders on the X2go + server (via sshfs) for session with ID <session_uuid> will get + unmounted. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to unshare + mounted folders + @type profile_name: C{str} + + @return: returns C{True} if all local folders could be successfully unmounted + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) + if len(_associated) > 0: + session_uuid = _associated[0] + if session_uuid: + return self.session_registry(session_uuid).unshare_all_local_folders() + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' from which to unmount local folders' % profile_name, loglevel=log.loglevel_WARN) + return False + __unshare_all_local_folders_from_session = unshare_all_local_folders_from_session + + def session_get_shared_folders(self, session_uuid): + """\ + Get a list of local folders mounted within X2go session with session hash <session_uuid> + from this client. + + @return: returns a C{list} of those local folder names that are mounted within X2go session <session_uuid>. + @rtype: C{list} + + """ + return self(session_uuid).get_shared_folders() + __session_get_shared_folders = session_get_shared_folders + ### ### Provide access to the X2goClient's session registry ### diff --git a/x2go/session.py b/x2go/session.py index 53b5dd5..39a950c 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -236,6 +236,7 @@ class X2goSession(object): self.terminal_params = {} self.sshproxy_params = {} self.update_params(params) + self.shared_folders = [] self.session_environment = {} @@ -1396,13 +1397,46 @@ class X2goSession(object): """ if self.has_terminal_session(): if self.allow_share_local_folders: - return self.terminal_session.share_local_folder(folder_name=folder_name) + if self.terminal_session.share_local_folder(folder_name=folder_name): + self.shared_folders.append(folder_name) + return True + return False else: self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) else: raise X2goSessionException('this X2goSession object does not have any associated terminal') __share_local_folder = share_local_folder + def unshare_all_local_folders(self): + """\ + Unshare all local folders mounted within this X2go session. + + @return: returns C{True} if all local folders could be successfully unmounted + inside this X2go session + @rtype: C{bool} + + """ + if self.has_terminal_session(): + if self.allow_share_local_folders: + self.shared_folders = [] + return self.terminal_session.unshare_all_local_folders() + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + else: + raise X2goSessionException('this X2goSession object does not have any associated terminal') + __unshare_all_local_folders = unshare_all_local_folders + + def get_shared_folders(self): + """\ + Get a list of local folders mounted within this X2go session from this client. + + @return: returns a C{list} of those folder names that are mounted with this X2go session. + @rtype: C{list} + + """ + return self.shared_folders + __get_shared_folders = get_shared_folders + def is_locked(self): """\ Query session if it is locked by some command being processed. 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-266-gf7f3638
by git-admin＠x2go.org 15 Sep '11

15 Sep '11

The branch, master has been updated via f7f363823f1bfafbe983ae01b7ca18979be25752 (commit) from bd1a17fce75b861bb8d58e698f3a52619e80f80e (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 f7f363823f1bfafbe983ae01b7ca18979be25752 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 15 14:46:06 2011 +0200 (awful syntax error fixes) ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goresume-session | 4 ++-- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 49880e0..bc5b866 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -83,8 +83,8 @@ echo "$NEWOPTIONS" >${SESSION_DIR}/options $X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null -kill -HUP $X2GO_AGENT_PID &>/dev/null && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || { +kill -HUP $X2GO_AGENT_PID &>/dev/null && { + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" } || { err_msg="ERROR: failed to resume session with ID $SESSION_NAME" echo err_$msg 1>&2 diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 139d0df..f336d03 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -40,7 +40,7 @@ killall -HUP knotify $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null kill -HUP $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || { + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" } || { err_msg="ERROR: failed to suspend session with ID $SESSION_NAME" echo err_$msg 1>&2 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 75bf277..a8bc92f 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -35,8 +35,8 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null -kill -TERM $X2GO_AGENT_PID &>/dev/null && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || { +kill -TERM $X2GO_AGENT_PID &>/dev/null && { + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" } || { err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" echo "err_$msg" 1>&2 hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

x2golxdebindings.git - master (branch) updated: 4d9c2a5660b0a9292af92ee06897b2f5606e0191
by git-admin＠x2go.org 15 Sep '11

15 Sep '11

The branch, master has been updated via 4d9c2a5660b0a9292af92ee06897b2f5606e0191 (commit) from 35b86a6fdfa93eb807413d9f22425c5dc2971246 (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 4d9c2a5660b0a9292af92ee06897b2f5606e0191 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 15 14:07:23 2011 +0200 Depend on destop-file-utils. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/control | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2513f7c..5ac8866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low * Imported original tarball version to X2go Git. * Adds Debian/Ubuntu packaging (/debian folder). * Add icon symlinks for sshfs/LXDE MIME types. + * Depend on destop-file-utils. [ Milan Knížek ] * Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 29 May 2011 22:36:34 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 15 Sep 2011 14:04:27 +0200 diff --git a/debian/control b/debian/control index 45eb109..ea84f81 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,8 @@ Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, x2goserver, - lxde-icon-theme + lxde-icon-theme, + desktop-file-utils Description: LXDE bindings for X2go X2go is a server based computing environment with - session resuming hooks/post-receive -- x2golxdebindings.git (LXDE bindings for X2go) 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 "x2golxdebindings.git" (LXDE bindings for X2go).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-32-g956ae90
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-3-g47ed80c
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, release/0.1.1.x has been updated via 47ed80c80e7d6e8388d699ed3e0897a4d7be9d04 (commit) from 6fd557ede24430dac8b67b2341152969ad5b1584 (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 47ed80c80e7d6e8388d699ed3e0897a4d7be9d04 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 15 00:13:56 2011 +0200 Add support for x2goumount-session calls. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2go/backends/terminal/_stdout.py | 18 +++++++++++++++ x2go/client.py | 42 +++++++++++++++++++++++++++++++++++++ x2go/session.py | 36 ++++++++++++++++++++++++++++++- 4 files changed, 96 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bcd22a1..9d3079e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ python-x2go (0.1.1.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - - continue development... + - Add support for x2goumount-session calls. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:43:55 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 92dac9f..339aa5f 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -678,6 +678,24 @@ class X2goTerminalSessionSTDOUT(object): (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) self.logger('x2gomountdirs output is : %s' % stdout.read().split('\n'), log.loglevel_NOTICE) + def unshare_all_local_folders(self): + """\ + Unshare all local folders mount in the X2go session. + + @return: returns C{True} if all local folders could be successfully unmounted from the X2go server session + @rtype: bool + + """ + self.logger('unsharing all local folders for session %s' % self.session_info, log.loglevel_INFO) + + cmd_line = [ 'export HOSTNAME &&', + 'x2goumount-session', + self.session_info, + ] + + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + self.logger('x2goumount-session output is : %s' % stdout.read().split('\n'), log.loglevel_NOTICE) + def color_depth(self): """\ Retrieve the session's color depth. diff --git a/x2go/client.py b/x2go/client.py index 396757b..cd3bae3 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1501,6 +1501,48 @@ class X2goClient(object): return False __share_local_folder_with_session = share_local_folder_with_session + def unshare_all_local_folders_from_session(self, session_uuid=None, folder_name=_LOCAL_HOME, profile_name=None): + """\ + Unshare all local folders mounted in X2go session registered as + C{session_uuid}. + + When calling this method all client-side mounted folders on the X2go + server (via sshfs) for session with ID <session_uuid> will get + unmounted. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to unshare + mounted folders + @type profile_name: C{str} + + @return: returns C{True} if all local folders could be successfully unmounted + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) + if len(_associated) > 0: + session_uuid = _associated[0] + if session_uuid: + return self.session_registry(session_uuid).unshare_all_local_folders() + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' from which to unmount local folders' % profile_name, loglevel=log.loglevel_WARN) + return False + __unshare_all_local_folders_from_session = unshare_all_local_folders_from_session + + def session_get_shared_folders(self, session_uuid): + """\ + Get a list of local folders mounted within X2go session with session hash <session_uuid> + from this client. + + @return: returns a C{list} of those local folder names that are mounted within X2go session <session_uuid>. + @rtype: C{list} + + """ + return self(session_uuid).get_shared_folders() + __session_get_shared_folders = session_get_shared_folders + ### ### Provide access to the X2goClient's session registry ### diff --git a/x2go/session.py b/x2go/session.py index 7d1c95e..054cfa1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -236,6 +236,7 @@ class X2goSession(object): self.terminal_params = {} self.sshproxy_params = {} self.update_params(params) + self.shared_folders = [] self.session_environment = {} @@ -1396,13 +1397,46 @@ class X2goSession(object): """ if self.has_terminal_session(): if self.allow_share_local_folders: - return self.terminal_session.share_local_folder(folder_name=folder_name) + if self.terminal_session.share_local_folder(folder_name=folder_name): + self.shared_folders.append(folder_name) + return True + return False else: self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) else: raise X2goSessionException('this X2goSession object does not have any associated terminal') __share_local_folder = share_local_folder + def unshare_all_local_folders(self): + """\ + Unshare all local folders mounted within this X2go session. + + @return: returns C{True} if all local folders could be successfully unmounted + inside this X2go session + @rtype: C{bool} + + """ + if self.has_terminal_session(): + if self.allow_share_local_folders: + self.shared_folders = [] + return self.terminal_session.unshare_all_local_folders() + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + else: + raise X2goSessionException('this X2goSession object does not have any associated terminal') + __unshare_all_local_folders = unshare_all_local_folders + + def get_shared_folders(self): + """\ + Get a list of local folders mounted within this X2go session from this client. + + @return: returns a C{list} of those folder names that are mounted with this X2go session. + @rtype: C{list} + + """ + return self.shared_folders + __get_shared_folders = get_shared_folders + def is_locked(self): """\ Query session if it is locked by some command being processed. 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).

1 0

pyhoca-contrib.git - master (branch) updated: 0.0.32.0-40-gcc9f41b
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via cc9f41b0d44e17ab509d6497bc5aece965ba8af9 (commit) from fccdd1dc0577f8099043a106459bb44d9657f76b (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 cc9f41b0d44e17ab509d6497bc5aece965ba8af9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 20:57:51 2011 +0200 built pyhoca-gui 0.1.0.8 for win32 ----------------------------------------------------------------------- Summary of changes: ....1.0.7.nsi => PyHoca-GUI+VcXsrv+GS_0.1.0.8.nsi} | 4 ++-- ...Hoca-GUI_0.1.0.7.nsi => PyHoca-GUI_0.1.0.8.nsi} | 2 +- win32-dist/dist/library.zip | Bin 1482596 -> 1482755 bytes win32-dist/dist/pyhoca-gui.exe | Bin 61440 -> 61440 bytes ...oca-gui+vcxsrv+gsprint-0.1.0.8_win32-setup.exe} | Bin 81678501 -> 81678738 bytes ...etup.exe => pyhoca-gui_0.1.0.8_win32-setup.exe} | Bin 12100239 -> 12100473 bytes 6 files changed, 3 insertions(+), 3 deletions(-) copy win32-dist/{PyHoca-GUI+VcXsrv+GS_0.1.0.7.nsi => PyHoca-GUI+VcXsrv+GS_0.1.0.8.nsi} (98%) copy win32-dist/{PyHoca-GUI_0.1.0.7.nsi => PyHoca-GUI_0.1.0.8.nsi} (99%) copy win32-dist/installers/{pyhoca-gui+vcxsrv+gsprint-0.1.0.7_win32-setup.exe => pyhoca-gui+vcxsrv+gsprint-0.1.0.8_win32-setup.exe} (98%) copy win32-dist/installers/{pyhoca-gui_0.1.0.7_win32-setup.exe => pyhoca-gui_0.1.0.8_win32-setup.exe} (91%) The diff of changes is: diff --git a/win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.7.nsi b/win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.8.nsi similarity index 98% copy from win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.7.nsi copy to win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.8.nsi index 0997cd2..9053774 100644 --- a/win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.7.nsi +++ b/win32-dist/PyHoca-GUI+VcXsrv+GS_0.1.0.8.nsi @@ -1,9 +1,9 @@ ; PyHoca-GUI.nsi ; -!define VERSION "0.1.0.7" +!define VERSION "0.1.0.8" !define PRODUCT_NAME "PyHoca-GUI" -!define PRODUCT_VERSION "0.1.0.7" +!define PRODUCT_VERSION "0.1.0.8" !define PRODUCT_PUBLISHER "X2go Team" ; diff --git a/win32-dist/PyHoca-GUI_0.1.0.7.nsi b/win32-dist/PyHoca-GUI_0.1.0.8.nsi similarity index 99% copy from win32-dist/PyHoca-GUI_0.1.0.7.nsi copy to win32-dist/PyHoca-GUI_0.1.0.8.nsi index f2e3e26..361de38 100644 --- a/win32-dist/PyHoca-GUI_0.1.0.7.nsi +++ b/win32-dist/PyHoca-GUI_0.1.0.8.nsi @@ -1,7 +1,7 @@ ; PyHoca-GUI.nsi ; -!define VERSION "0.1.0.7" +!define VERSION "0.1.0.8" ;-------------------------------- diff --git a/win32-dist/dist/library.zip b/win32-dist/dist/library.zip index 852c7f2..80152eb 100644 Binary files a/win32-dist/dist/library.zip and b/win32-dist/dist/library.zip differ diff --git a/win32-dist/dist/pyhoca-gui.exe b/win32-dist/dist/pyhoca-gui.exe index fdb7618..a2675d5 100644 Binary files a/win32-dist/dist/pyhoca-gui.exe and b/win32-dist/dist/pyhoca-gui.exe differ diff --git a/win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.7_win32-setup.exe b/win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.8_win32-setup.exe similarity index 98% copy from win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.7_win32-setup.exe copy to win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.8_win32-setup.exe index e07c805..47d849c 100644 Binary files a/win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.7_win32-setup.exe and b/win32-dist/installers/pyhoca-gui+vcxsrv+gsprint-0.1.0.8_win32-setup.exe differ diff --git a/win32-dist/installers/pyhoca-gui_0.1.0.7_win32-setup.exe b/win32-dist/installers/pyhoca-gui_0.1.0.8_win32-setup.exe similarity index 91% copy from win32-dist/installers/pyhoca-gui_0.1.0.7_win32-setup.exe copy to win32-dist/installers/pyhoca-gui_0.1.0.8_win32-setup.exe index e488eab..20f3af0 100644 Binary files a/win32-dist/installers/pyhoca-gui_0.1.0.7_win32-setup.exe and b/win32-dist/installers/pyhoca-gui_0.1.0.8_win32-setup.exe differ hooks/post-receive -- pyhoca-contrib.git (PyHoca-GUI / Python-X2go contributive Software) 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 "pyhoca-contrib.git" (PyHoca-GUI / Python-X2go contributive Software).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-265-gbd1a17f
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via bd1a17fce75b861bb8d58e698f3a52619e80f80e (commit) from c10acfd3aedaa8ca2b5a31eb8e4bdeed427442b4 (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 bd1a17fce75b861bb8d58e698f3a52619e80f80e Author: Ivan Kabaivanov <chepati(a)yahoo.com> Date: Wed Sep 14 22:40:01 2011 +0200 Makefile fix around man page installation in x2goserver-extensions package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-compat/Makefile | 2 +- x2goserver-extensions/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 58cfe0f..2a107b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. + * Makefile fix around man page installation in x2goserver-extensions package. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index 3e80663..e1bc30f 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -68,7 +68,7 @@ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 - gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 152dc92..b234c16 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -67,8 +67,8 @@ install_config: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) man/man1/*.8 $(DESTDIR)$(MANDIR)/man8 - gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.1.0.6-27-gd7cc742
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, build-main has been updated via d7cc74265b286d65c55273f1312c04748d09c5be (commit) via 5d6108fbe12a940e961e3ff70d497cc0a98d05c6 (commit) via 209f58795491f69c5422e2015cfda26a4b500f8c (commit) via 5c04c95acf7a394e22e311f960c51252101bd5c2 (commit) from 9b5c4cdb9799a0715478beaef340e38723086bf9 (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 | 12 ++++++++++++ pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/profilemanager.py | 2 ++ 3 files changed, 15 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7eda494..dd30ded 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pyhoca-gui (0.1.0.8-0~x2go1) unstable; urgency=low + + * New upstream version (0.1.0.8): + - fix session profile breakage when switching between rootless and + non-rootless sessions, fixes problems with x2goclient after + pyhoca-gui has been used on session profiles that have been switched + from desktop to rootless to desktop. + - x2goclient compat fix: make sure applications property in session + profiles gets always set. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:45:19 +0200 + pyhoca-gui (0.1.0.7-0~x2go1) unstable; urgency=low * New upstream version (0.1.0.7) diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 18a8b1e..10c3e7a 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0.7' +__VERSION__ = '0.1.0.8' from frontend import * diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 43812bb..0cce214 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -952,6 +952,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ) self.profile_config['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() + self.profile_config['applications'] = self.applicationChoices.keys() _session_type = [ s for s in self.sessionChoices.keys() if self.sessionChoices[s] == self.SessionType.GetValue() ][0] if _session_type == 'APPLICATION': _command = [ a for a in self.applicationChoices.keys() if self.applicationChoices[a] == self.Application.GetValue() ][0] @@ -964,6 +965,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['rootless'] = True else: _command = _session_type + self.profile_config['rootless'] = False self.profile_config['command'] = _command self.profile_config['rdpserver'] = self.RDPServer.GetValue() self.profile_config['rdpoptions'] = self.RDPOptions.GetValue() hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - release (branch) created: 0.0.32.0
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, release has been created at e22118fcbcca288f06acbb74449b14b0c9f44dd1 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits