[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.0.5-6-ge42f321
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:18:06 CET 2014
The branch, release/0.4.0.x has been updated
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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2go/session.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ae2cb9..ce474c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low
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.
-- 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 aa3a156..c2233f2 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -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).
More information about the x2go-commits
mailing list