This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 70cedd90d1ea52df5f02e47e5b32c8ffdd6134e2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:41:55 2015 +0100 Fix string concatenation/layout of error message when tunnel I/O errors occur. --- debian/changelog | 2 ++ sshprocess.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c04197f..ebf1c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405). + - Fix string concatenation/layout of error message when tunnel I/O errors + occur. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/sshprocess.cpp b/sshprocess.cpp index b1a940c..84af170 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -373,11 +373,13 @@ void SshProcess::slotIOerr(SshProcess* creator, QString message, QString sshSess { if (creator!=this) return; + if (sshSessionErr.length()) + sshSessionErr = " - "+sshSessionErr; #ifdef DEBUG - x2goDebug<<"io error:"<<message<<" - "<<sshSessionErr<<endl; + x2goDebug<<"I/O error: "<<message<<sshSessionErr<<" ("<<pid<<")."<<endl; #endif normalExited=false; - abortString=message+" - "+sshSessionErr; + abortString="I/O error: "+message+sshSessionErr; } void SshProcess::slotCopyErr(SshProcess* creator, QString message, QString sshSessionErr) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git