[X2Go-Commits] [python-x2go] 01/01: Detect non-installed sshfs (required for Telekinesis).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 02531f1ce71d4e38242fdf83e2d0b2e37859c165
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 23:03:24 2014 +0200

    Detect non-installed sshfs (required for Telekinesis).
    
      * debian/control:
        + Add R (python-x2go): sshfs.
        + Add S (python-x2go): telekinesis-client, mteleplayer-clientside.
---
 debian/changelog    |    3 +++
 debian/control      |    8 ++++++--
 x2go/telekinesis.py |   19 +++++++++++++------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1898a4..47e7278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,8 +106,11 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Fix session lock release in various methods of the X2GoSession class.
     - Release _share_local_folder_lock on instance X2GoTerminalSession
       destruction.
+    - Detect non-installed sshfs (required for Telekinesis).
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
+    + Add R (python-x2go): sshfs.
+    + Add S (python-x2go): telekinesis-client, mteleplayer-clientside.
   * python-x2go.spec:
     + Add dependencies: python-requests, python-simplejson.
 
diff --git a/debian/control b/debian/control
index aac1ed3..5ee144e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,10 +30,14 @@ Depends:
  python-requests,
  python-simplejson,
  python-xlib,
- nxproxy
+ nxproxy,
+ sshfs,
 Recommends:
  cups-bsd | lpr,
- pulseaudio
+ pulseaudio,
+Suggests:
+ telekinesis-client,
+ mteleplayer-clientside,
 Description: Python module providing X2Go client API
  X2Go is a server based computing environment with
     - session resuming
diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py
index bf93f0b..2e8dda1 100644
--- a/x2go/telekinesis.py
+++ b/x2go/telekinesis.py
@@ -347,12 +347,19 @@ class X2GoTelekinesisClient(threading.Thread):
                                          '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_name),
                                         ]
         self.logger('forking threaded subprocess: %s' % " ".join(telekinesis_sshfs_command), loglevel=log.loglevel_DEBUG)
-        self.telekinesis_sshfs = subprocess.Popen(telekinesis_sshfs_command,
-                                                  env=self.TEKICLIENT_ENV,
-                                                  stdin=None,
-                                                  stdout=self.tekiclient_datalog_stdout,
-                                                  stderr=self.tekiclient_datalog_stderr,
-                                                  shell=False)
+        try:
+            self.telekinesis_sshfs = subprocess.Popen(telekinesis_sshfs_command,
+                                                      env=self.TEKICLIENT_ENV,
+                                                      stdin=None,
+                                                      stdout=self.tekiclient_datalog_stdout,
+                                                      stderr=self.tekiclient_datalog_stderr,
+                                                      shell=False)
+        except OSError, e:
+            if e.errno == 2:
+                self.logger("The 'sshfs' command is not available on your client machine, please install it to get Telekinesis up and running!!!", loglevel=log.loglevel_WARN)
+            else:
+                self.logger("An error occurred while setting up the Telekinesis data stream (via SSHFS): %s (errno: %s)" % (str(e), e.errno), loglevel=log.loglevel_WARN)
+            return None, False
 
         # also wait for telekinesis data tunnel to become active
         _count = 0

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git