The branch, release/4.0.0.x has been updated via 69f9b75e0728c59e3e7e67965cc6d975af8fc5c0 (commit) from 186910dbdd7cb875968a04ddbd8b046f953f1654 (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 ----------------------------------------------------------------- commit 69f9b75e0728c59e3e7e67965cc6d975af8fc5c0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 22 21:54:09 2013 +0100 Revert "Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC variable if command have the arguments wich have same names as existing commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". Now we splitting $cmd and taking only first part." This reverts commit 186910dbdd7cb875968a04ddbd8b046f953f1654. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 -------- x2goserver/bin/x2goruncommand | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d0af1b8..9e5a9af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,10 @@ x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low - [ Mike Gabriel ] * New upstream version (4.0.0.6): - Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). - [ Oleksandr Shneyder ] - * New upstream version (4.0.0.6): - - Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC - variable if command have the arguments wich have same names as existing - commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". - Now we splitting $cmd and taking only first part. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 9350352..2f95341 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -183,8 +183,7 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -WCMD=`echo $cmd | cut -d " " -f 1` -EXEC=`type -P $WCMD` +EXEC=`which $cmd` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).