This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx-kerberos in repository x2goclient. from f07d58f sshprocess.cpp: export PATH variable when running commands. new 69fd7ea sshprocess.cpp: wrap SSH command prelude and conclusion in double quotes. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ src/sshprocess.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx-kerberos in repository x2goclient. commit 69fd7ea9b075a5bd85bea228cbc67217209ffb99 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 22:46:34 2015 +0200 sshprocess.cpp: wrap SSH command prelude and conclusion in double quotes. --- debian/changelog | 2 ++ src/sshprocess.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35f60b5..8f84b33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low truncation issues. - sshprocess.cpp: export PATH variable when running commands. Otherwise, only the first one will respect the new PATH value. + - sshprocess.cpp: wrap SSH command prelude and conclusion in double + quotes. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp index 9dbba4e..cc5a891 100644 --- a/src/sshprocess.cpp +++ b/src/sshprocess.cpp @@ -200,7 +200,7 @@ void SshProcess::startNormal(const QString& cmd) // #endif if(!masterCon->useKerberos()) { - QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; export PATH=/usr/local/bin:/usr/bin:/bin; "+cmd+"; echo X2GODATAEND:" + uuidStr +";'"; + QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr +"\";'"; x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');"; masterCon->addChannelConnection(this, uuidStr, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); @@ -209,7 +209,9 @@ void SshProcess::startNormal(const QString& cmd) else { QString host=masterCon->getHost(); - QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; export PATH=/usr/local/bin:/usr/bin:/bin; "+cmd+"; echo X2GODATAEND:" + uuidStr +";'"; + + QString shcmd = "sh -c 'echo \\\"X2GODATABEGIN:" + uuidStr + "\\\"; export PATH=\\\"/usr/local/bin:/usr/bin:/bin\\\"; "+cmd+"; echo \\\"X2GODATAEND:" + uuidStr +"\\\";'"; + proc=new QProcess(this); #ifdef Q_OS_WIN if(masterCon->get_kerberosDelegation()) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org