x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2gognomebindings.git - master (branch) updated: 2.0.1.1-23-gbd30c19
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via bd30c195b3b7dea414453908ebabf8a73c2ba48e (commit) from 8e182c47b6cd57587588f06e1bcfa00f11c29434 (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 bd30c195b3b7dea414453908ebabf8a73c2ba48e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 26 00:13:03 2011 +0200 Rename sshfs.xml to sshfs-x2go-gnome.xml. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../packages/{sshfs.xml => sshfs-x2go-gnome.xml} | 0 2 files changed, 1 insertions(+), 0 deletions(-) rename share/mime/packages/{sshfs.xml => sshfs-x2go-gnome.xml} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2a3e170..cabf5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Add simple man page for x2gonautilus. - Place x2go-suspend.desktop icon in GNOME Network submenu. - Define unique MIME name spaces for X2go SSHFS GNOME icons. + - Rename sshfs.xml to sshfs-x2go-gnome.xml. * Add gnome-menus as dependency. * Now fully use debhelper for packaging. Reduced linitian issues nearly completely (still open: old-format-menu-file diff --git a/share/mime/packages/sshfs.xml b/share/mime/packages/sshfs-x2go-gnome.xml similarity index 100% rename from share/mime/packages/sshfs.xml rename to share/mime/packages/sshfs-x2go-gnome.xml hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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 "x2gognomebindings.git" (X2go bindings for GNOME).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-58-g1b8e6a3
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 1b8e6a3ffe35e2068d27220399c4f179e0542d10 (commit) from a04eec2fc959054572bed038ede4824ac379d11b (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 1b8e6a3ffe35e2068d27220399c4f179e0542d10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 23:40:02 2011 +0200 Improve local session cache dir removal. ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 8 ++++---- x2go/backends/terminal/_stdout.py | 33 ++++++++++++++++++++++++++------- x2go/client.py | 4 +++- x2go/session.py | 11 +++++++---- 4 files changed, 40 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 5b5b63a..74bc797 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -758,7 +758,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return _listsessions - def clean_sessions(self): + def clean_sessions(self, destroy_terminals=True): """\ Find X2go terminals that have previously been started by the connected user on the remote X2go server and terminate them. @@ -766,7 +766,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ session_list = self.list_sessions() for session_name in session_list.keys(): - self.terminate(session_name=session_name) + self.terminate(session_name=session_name, destroy_terminals=destroy_terminals) def is_connected(self): """\ @@ -873,7 +873,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return _ret - def terminate(self, session_name): + def terminate(self, session_name, destroy_terminals=True): """\ Terminate either this or another available X2go session on the connected server. @@ -898,7 +898,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): dummy_stdout = stdout.read() dummy_stderr = stderr.read() if self.associated_terminals.has_key(session_name): - if self.associated_terminals[session_name] is not None: + if self.associated_terminals[session_name] is not None and destroy_terminals: self.associated_terminals[session_name].__del__() try: del self.associated_terminals[session_name] except KeyError: pass diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index c48bcd2..7289d80 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -326,6 +326,8 @@ class X2goTerminalSessionSTDOUT(object): else: self.session_info = info_backend() + self._cleaned_up = False + def __del__(self): self._x2go_tidy_up() @@ -351,7 +353,6 @@ class X2goTerminalSessionSTDOUT(object): except AttributeError: pass - # destroy current session information self.session_info.clear() def _mk_sessions_rootdir(self, d): @@ -367,8 +368,13 @@ class X2goTerminalSessionSTDOUT(object): def _rm_session_dirtree(self): - if self.session_info: - shutil.rmtree(self.session_info.name, ignore_errors=True) + if self.session_info.name: + shutil.rmtree('%s/S-%s' % (self.params.rootdir, self.session_info), ignore_errors=True) + + def _rm_desktop_dirtree(self): + + if self.session_info.display: + shutil.rmtree('%s/S-%s' % (self.params.rootdir, self.session_info.display), ignore_errors=True) def get_session_name(self): """\ @@ -1029,8 +1035,10 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - self.control_session.terminate(session_name=self.session_info.name) + self.control_session.terminate(session_name=self.session_info.name, destroy_terminals=False) self.release_proxy() + self.post_terminate_cleanup() + self.__del__() # TODO: check if session has really suspended _ret = True @@ -1050,7 +1058,18 @@ class X2goTerminalSessionSTDOUT(object): STILL UNDOCUMENTED """ - # if we run in debug mode, we keep local session directories - if self.logger.get_loglevel() & log.loglevel_DEBUG != log.loglevel_DEBUG: + # this method might be called twice (directly and from update_status in the session + # registry instance. So we have to make sure, that this code will not fail + # if called twice. + if not self._cleaned_up and self.session_info.name: + # otherwise we wipe the session files locally - self._rm_session_dirtree() + self.logger('cleaning up session %s after termination' % self.session_info, loglevel=log.loglevel_NOTICE) + + # if we run in debug mode, we keep local session directories + if self.logger.get_loglevel() & log.loglevel_DEBUG != log.loglevel_DEBUG: + + self._rm_session_dirtree() + self._rm_desktop_dirtree() + + self._cleaned_up = True diff --git a/x2go/client.py b/x2go/client.py index 4ff7cd1..e8b85b5 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -319,6 +319,7 @@ class X2goClient(object): refresh_interval=refresh_interval, logger=self.logger ) + self.auto_update_sessionregistry = auto_update_sessionregistry if use_listsessions_cache: self.listsessions_cache = X2goListSessionsCache(self, logger=self.logger) @@ -2010,8 +2011,9 @@ class X2goClient(object): @type session_uuid: C{str} """ + _destroy_terminals = not ( self.auto_update_sessionregistry == True) session = self.session_registry(session_uuid) - session.clean_sessions() + session.clean_sessions(destroy_terminals=_destroy_terminals) __clean_sessions = clean_sessions def list_sessions(self, session_uuid=None, diff --git a/x2go/session.py b/x2go/session.py index ddb8b3b..65c9689 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -853,13 +853,13 @@ class X2goSession(object): return self.connected __is_alive = is_alive - def clean_sessions(self): + def clean_sessions(self, destroy_terminals=True): """\ Clean all running sessions for the authenticated user on the remote X2go server. """ if self.is_alive(): - self.control_session.clean_sessions() + self.control_session.clean_sessions(destroy_terminals=destroy_terminals) else: self._X2goSession__disconnect() __clean_sessions = clean_sessions @@ -1514,10 +1514,13 @@ class X2goSession(object): self.terminal_session.release_proxy() # unmount shared folders - self.unshare_all_local_folders() + try: + self.unshare_all_local_folders() + except X2goSessionException: + pass # remove client-side session cache - if self.terminated: + if self.terminated and self.has_terminal_session(): self.terminal_session.post_terminate_cleanup() # destroy terminal session 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-57-ga04eec2
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via a04eec2fc959054572bed038ede4824ac379d11b (commit) from b2ba91b1c47870a8cc0ac41ec0b3921062cafcba (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 a04eec2fc959054572bed038ede4824ac379d11b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 23:38:56 2011 +0200 provide better __repr__ output for debugging session infos ----------------------------------------------------------------------- Summary of changes: x2go/backends/info/_stdout.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 529a8f3..c492d2d 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -27,6 +27,11 @@ via server-side STDOUT. """ __NAME__ = 'x2goserversessioninfo-pylib' + +# modules +import types + + class X2goServerSessionInfoSTDOUT(object): """\ L{X2goServerSessionInfo} is used to store all information @@ -37,7 +42,11 @@ class X2goServerSessionInfoSTDOUT(object): def __str__(self): return self.name def __repr__(self): - return "<%s instance: %s>" % (self.__class__, self.name) + result = 'X2goServerSessionInfoSTDOUT(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue + result += p + '=' + str(self.__dict__[p]) +',' + return result.strip(',') + ')' def _parse_x2golistsessions_line(self, x2go_output): """\ 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-56-gb2ba91b
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via b2ba91b1c47870a8cc0ac41ec0b3921062cafcba (commit) from 8f5a27d8a245ca0f5e149c879f83cb086a5f22c5 (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 b2ba91b1c47870a8cc0ac41ec0b3921062cafcba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:35:06 2011 +0200 Remove local session cache folders after sessions have terminated. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 16 ++++++++++++++++ x2go/session.py | 5 +++++ 3 files changed, 22 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b7b89a9..e0e2ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. - Unshare local folders during session cleanup. + - Remove local session cache folders after sessions have terminated. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 4ada1a1..c48bcd2 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -35,6 +35,7 @@ import threading import signal import cStringIO import copy +import shutil # Python X2go modules import x2go.rforward as rforward @@ -350,6 +351,7 @@ class X2goTerminalSessionSTDOUT(object): except AttributeError: pass + # destroy current session information self.session_info.clear() def _mk_sessions_rootdir(self, d): @@ -363,6 +365,11 @@ class X2goTerminalSessionSTDOUT(object): else: raise OSError, e + def _rm_session_dirtree(self): + + if self.session_info: + shutil.rmtree(self.session_info.name, ignore_errors=True) + def get_session_name(self): """\ STILL UNDOCUMENTED @@ -1038,3 +1045,12 @@ class X2goTerminalSessionSTDOUT(object): if self.proxy is not None: self.proxy.__del__() + def post_terminate_cleanup(self): + """\ + STILL UNDOCUMENTED + + """ + # if we run in debug mode, we keep local session directories + if self.logger.get_loglevel() & log.loglevel_DEBUG != log.loglevel_DEBUG: + # otherwise we wipe the session files locally + self._rm_session_dirtree() diff --git a/x2go/session.py b/x2go/session.py index 7b77d0d..ddb8b3b 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1516,7 +1516,12 @@ class X2goSession(object): # unmount shared folders self.unshare_all_local_folders() + # remove client-side session cache + if self.terminated: + self.terminal_session.post_terminate_cleanup() + # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() + self.terminal_session = None 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-55-g8f5a27d
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 8f5a27d8a245ca0f5e149c879f83cb086a5f22c5 (commit) from 523dce8535c36b7f6063446c2c84e2e71e3fc315 (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 8f5a27d8a245ca0f5e149c879f83cb086a5f22c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:09:42 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index b868ad8..7b77d0d 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1180,9 +1180,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unshare mounted folders - self.unshare_all_local_folders() - if self.terminal_session.suspend(): self.running = False @@ -1222,9 +1219,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unmount shared folders - self.unshare_all_local_folders() - if self.terminal_session.terminate(): self.running = False self.suspended = False 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 - release/0.1.1.x (branch) updated: 0.1.1.7-5-gcdeb38f
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, release/0.1.1.x has been updated via cdeb38f6ada3cdc38b5095e76993b6773b2a340b (commit) from fa6659cc58faadf3f92a36b89bf19ec7668c253f (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 cdeb38f6ada3cdc38b5095e76993b6773b2a340b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:09:42 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 07b9b33..c623214 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1180,9 +1180,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unshare mounted folders - self.unshare_all_local_folders() - if self.terminal_session.suspend(): self.running = False @@ -1222,9 +1219,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unmount shared folders - self.unshare_all_local_folders() - if self.terminal_session.terminate(): self.running = False self.suspended = False 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-54-g523dce8
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 523dce8535c36b7f6063446c2c84e2e71e3fc315 (commit) from 152e901ae69f36aa583b8b2d50509e3a9bed0c74 (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 523dce8535c36b7f6063446c2c84e2e71e3fc315 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:01:50 2011 +0200 Unshare local folders during session cleanup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d5d1e54..b7b89a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. + - Unshare local folders during session cleanup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/session.py b/x2go/session.py index aff19c1..b868ad8 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1515,8 +1515,14 @@ class X2goSession(object): Clean up X2go session. """ + # release terminal session's proxy if self.has_terminal_session(): self.terminal_session.release_proxy() + + # unmount shared folders + self.unshare_all_local_folders() + + # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None 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 - release/0.1.1.x (branch) updated: 0.1.1.7-4-gfa6659c
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, release/0.1.1.x has been updated via fa6659cc58faadf3f92a36b89bf19ec7668c253f (commit) from 9ad6a08f4cb48427f72ac0b5b72bb21291e824d2 (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 fa6659cc58faadf3f92a36b89bf19ec7668c253f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:01:50 2011 +0200 Unshare local folders during session cleanup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d4fc98..62718c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. + - Unshare local folders during session cleanup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/session.py b/x2go/session.py index ed1e8b5..07b9b33 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1515,8 +1515,14 @@ class X2goSession(object): Clean up X2go session. """ + # release terminal session's proxy if self.has_terminal_session(): self.terminal_session.release_proxy() + + # unmount shared folders + self.unshare_all_local_folders() + + # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None 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-305-gb8c2618
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via b8c2618c8f1efaf4ea3aa320538577c7481a54af (commit) via 059350c3ab42affeae78e7b14042838f46b69acd (commit) via b24531392088b16364a4e3730630f16dcdc0ec2f (commit) from f0c85abd21ffd6354044fee40a4ecc6e0a3fdec9 (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 b8c2618c8f1efaf4ea3aa320538577c7481a54af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:56:38 2011 +0200 Clean session dir ~/.x2go/C-<session_id> after session terminates, if not running in debug mode. commit 059350c3ab42affeae78e7b14042838f46b69acd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 03:30:54 2011 +0200 Pass extra argument $USER to client-mode x2godesktopsharing, requires x2godesktopsharing (>=3.0.1.3) for it to work. commit b24531392088b16364a4e3730630f16dcdc0ec2f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 03:28:47 2011 +0200 log message improvement ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 4 ++++ x2goserver/bin/x2gostartagent | 6 +++--- x2goserver/bin/x2goterminate-session | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8890f61..f284e08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,10 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Makefile update for including x2gofeature scripts into installation, minor fixes to x2goserver core package Makefile. * Add debug output around shadow session startup (in x2gostartagent). + * Pass extra argument $USER to client-mode x2godesktopsharing, requires + x2godesktopsharing (>=3.0.1.3) for it to work. + * Clean session dir ~/.x2go/C-<session_id> after session terminates, if not + running in debug mode. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7e8db47..345ad33 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -128,3 +128,7 @@ kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME x2goumount-session $X2GO_SESSION + +if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then + rm -Rf $HOME/.x2go/C-$X2GO_SESSION +fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 765268a..2759865 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -53,9 +53,9 @@ if [ "$X2GO_STYPE" == "S" ]; then if [ "$SHADOW_USER" != "$USER" ]; then - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user $USER requests desktop sharing from user $SHADOW_USER on display $SHADOW_DISPLAY" - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@" - OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@` + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''" + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@ $USER" + OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@ $USER` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT" if [ "$OUTPUT" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index bcd1f9f..5b1cd23 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -48,3 +48,7 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { export HOSTNAME x2goumount-session $SESSION_NAME + +if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then + rm -Rf $HOME/.x2go/C-$SESSION_NAME +fi 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

x2gognomebindings.git - master (branch) updated: 2.0.1.1-22-g8e182c4
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 8e182c47b6cd57587588f06e1bcfa00f11c29434 (commit) via 7576438990bbd9a19f5f51f9f0e4832492c9fe21 (commit) from 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 (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 8e182c47b6cd57587588f06e1bcfa00f11c29434 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:38:51 2011 +0200 Define unique MIME name spaces for X2go SSHFS GNOME icons. commit 7576438990bbd9a19f5f51f9f0e4832492c9fe21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:38:16 2011 +0200 forgot to add x2gonautilus man page ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 3 +- man/man8/x2gonautilus.8 | 22 ++++++++++++++++++++ share/applications/x2gonautilus.desktop | 2 +- ...nome-mime-application-sshfscdrom-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfscdrom.svg | 1 - ...gnome-mime-application-sshfsdisk-x2go-gnome.svg | 1 + .../mimetypes/gnome-mime-application-sshfsdisk.svg | 1 - ...-mime-application-sshfsremovable-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfsremovable.svg | 1 - share/mime/packages/sshfs.xml | 6 ++-- 11 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 man/man8/x2gonautilus.8 create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b5d21e1..2a3e170 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. - Add simple man page for x2gonautilus. - Place x2go-suspend.desktop icon in GNOME Network submenu. + - Define unique MIME name spaces for X2go SSHFS GNOME icons. * Add gnome-menus as dependency. * Now fully use debhelper for packaging. Reduced linitian issues nearly completely (still open: old-format-menu-file diff --git a/debian/control b/debian/control index 51e8346..6f55d7d 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, x2goserver, zenity, - gnome-menus + gnome-menus, + gnome-colors-common Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming diff --git a/man/man8/x2gonautilus.8 b/man/man8/x2gonautilus.8 new file mode 100644 index 0000000..d99667f --- /dev/null +++ b/man/man8/x2gonautilus.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gonautilus 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gonautilus \- X2go GNOME Wrapper for Browsing X2go Shared Folders with Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2gonautilus <path> + +.SH DESCRIPTION +\fBx2gonautilus\fR is a component of the X2go GNOME bindings and a simple wrapper GNOME's Nautilus +file browser for X2go-base shared folders. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop index 4b9f090..c653e6d 100644 --- a/share/applications/x2gonautilus.desktop +++ b/share/applications/x2gonautilus.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=x2gonautilus -MimeType=application/sshfsdisk;application/sshfscdrom;application/sshfsremovable +MimeType=application/sshfsdisk-x2go-gnome;application/sshfscdrom-x2go-gnome;application/sshfsremovable-x2go-gnome Exec=x2gonautilus %f Type=Application Terminal=false diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg new file mode 120000 index 0000000..20f78dd --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg deleted file mode 120000 index 92dbac8..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg new file mode 120000 index 0000000..3a2e8f9 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg deleted file mode 120000 index 388c35e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg new file mode 120000 index 0000000..7ca88a1 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg deleted file mode 120000 index ab47d4e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/mime/packages/sshfs.xml b/share/mime/packages/sshfs.xml index fe04e48..5c8b19e 100644 --- a/share/mime/packages/sshfs.xml +++ b/share/mime/packages/sshfs.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/sshfscdrom"> + <mime-type type="application/sshfscdrom-x2go-gnome"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> <glob pattern="*(sshfs-cdrom)"/> </mime-type> - <mime-type type="application/sshfsdisk"> + <mime-type type="application/sshfsdisk-x2go-gnome"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> <glob pattern="*(sshfs-disk)"/> </mime-type> - <mime-type type="application/sshfsremovable"> + <mime-type type="application/sshfsremovable-x2go-gnome"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> <glob pattern="*(sshfs-removable)"/> hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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 "x2gognomebindings.git" (X2go bindings for GNOME).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits