[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.5-2-g74e94b3
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:10 CET 2014
The branch, build-baikal has been updated
via 74e94b351511c2dd1c8e7a7ca6eb92e97f4ec220 (commit)
from 1cfff12e78fdcd63758a31100f3decbbc6be98a4 (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 | 4 +++-
x2go/session.py | 21 +++++++++++----------
2 files changed, 14 insertions(+), 11 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2aa2f35..a8769bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.2.0.6)
+ - Ignore non-master sessions before calling the foldersharing-
+ not-available hook.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 12 Jun 2012 15:51:52 +0200
diff --git a/x2go/session.py b/x2go/session.py
index 160ee53..2edba02 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -2057,16 +2057,17 @@ 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_folder_sharing_available() and self.is_master_session():
- if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None:
- _retval = True
- for _folder in self.share_local_folders:
- try:
- _retval = self.share_local_folder(_folder) and _retval
- except x2go_exceptions.X2goUserException, e:
- self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
- else:
- self.HOOK_foldersharing_not_available()
+ 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:
+ _retval = True
+ for _folder in self.share_local_folders:
+ try:
+ _retval = self.share_local_folder(_folder) and _retval
+ except x2go_exceptions.X2goUserException, e:
+ self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
+ else:
+ self.HOOK_foldersharing_not_available()
return _retval
def unshare_all_local_folders(self, force_all=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).
More information about the x2go-commits
mailing list