The branch, master has been updated via 704b80dd82e91fc90b38b0ba414fa4dd251e9720 (commit) via a5b0cbb4f6e197084dc2ebb8783b658871c90086 (commit) via e42f321cb958430b9f076095a533b273038e0b0c (commit) from 69b60b4eebbfc5fac4050a96d8185009a13a1f6b (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 704b80dd82e91fc90b38b0ba414fa4dd251e9720 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 2 20:41:49 2012 +0200 release 0.2.0.6 commit a5b0cbb4f6e197084dc2ebb8783b658871c90086 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 2 20:35:52 2012 +0200 X2goSession.HOOK_printing_not_available(): Fix log message. commit e42f321cb958430b9f076095a533b273038e0b0c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 2 20:34:38 2012 +0200 Avoid double notifications on SSHFS being unavailable for the authenticated user. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++-- x2go/session.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2ae2cb9..c4ca21d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.6-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.6) - Ignore non-master sessions before calling the foldersharing- not-available hook. - Add several double underscore method aliases in X2goSession class. - Add several double underscore method aliases in X2goClient class. + - Avoid double notifications on SSHFS being unavailable for the + authenticated user. + - X2goSession.HOOK_printing_not_available(): Fix log message. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 12 Jun 2012 15:51:52 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 02 Jul 2012 20:41:42 +0200 python-x2go (0.2.0.5-0~x2go1) unstable; urgency=low diff --git a/x2go/session.py b/x2go/session.py index aa3a156..c04a391 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -434,7 +434,7 @@ class X2goSession(object): if self.client_instance: self.client_instance.HOOK_printing_not_available(profile_name=self.profile_name, session_name=self.session_name) else: - self.logger('HOOK_foldersharing_not_available: X2Go\'s client-side printing feature is not available with this session (%s) of profile %s.' % (self.session_name, self.profile_name), loglevel=log.loglevel_WARN) + self.logger('HOOK_printing_not_available: X2Go\'s client-side printing feature is not available with this session (%s) of profile %s.' % (self.session_name, self.profile_name), loglevel=log.loglevel_WARN) def HOOK_mimebox_not_available(self): """\ @@ -2080,7 +2080,7 @@ class X2goSession(object): """ _retval = False - if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running() and self.allow_share_local_folders: + if self.is_running() and not self.faulty and self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.allow_share_local_folders and self.has_terminal_session(): if self.is_master_session(): if self.is_folder_sharing_available(): if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not 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).