[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 8dfd1f368df28d1a767c1b9345457d59bbe097c6

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:19:46 CET 2014


The branch, brokerclient has been updated
       via  8dfd1f368df28d1a767c1b9345457d59bbe097c6 (commit)
      from  9ecbb8f58627e55cc39da03aaf33ba6a88e6c0e6 (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:
 x2go/backends/terminal/_stdout.py |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index e6b3553..e1b48e5 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -638,10 +638,16 @@ class X2goTerminalSessionSTDOUT(object):
         Verify if the command <cmd> exists on the X2go server.
 
         """
-        test_cmd = 'which %s && echo OK' % os.path.basename(cmd)
-        (stdin, stdout, stderr) = self.control_session._x2go_exec_command([test_cmd])
-        _stdout = stdout.read()
-        return _stdout.find('OK') != -1
+        if cmd.find('RDP') != -1:
+            cmd = 'rdesktop'
+
+        if cmd:
+            test_cmd = 'which %s && echo OK' % os.path.basename(cmd.split()[0])
+            (stdin, stdout, stderr) = self.control_session._x2go_exec_command([test_cmd])
+            _stdout = stdout.read()
+            return _stdout.find('OK') != -1
+        else:
+            return False
 
     def run_command(self, cmd=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