[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 9b6ad6be40dd1f19f81e923d303201c3c336a0d8
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:16:17 CET 2014
The branch, release/0.4.0.x has been updated
via 9b6ad6be40dd1f19f81e923d303201c3c336a0d8 (commit)
from 09728ed007229f2dbfc424b08ce6cd76d533eeac (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 | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index e130adb..2745d76 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -643,14 +643,16 @@ class X2goTerminalSessionSTDOUT(object):
Verify if the command <cmd> exists on the X2go server.
"""
+ cmd = cmd.strip('"').strip('"')
if cmd.find('RDP') != -1:
cmd = 'rdesktop'
- if cmd.strip('"').strip('"') in _X2GO_GENERIC_APPLICATIONS:
+ if cmd in _X2GO_GENERIC_APPLICATIONS:
return True
-
- if cmd:
+ elif cmd:
test_cmd = 'which %s && echo OK' % os.path.basename(cmd.split()[0])
+
+ if test_cmd:
(stdin, stdout, stderr) = self.control_session._x2go_exec_command([test_cmd])
_stdout = stdout.read()
return _stdout.find('OK') != -1
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