This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.
commit bb727e5380916de20243caf949d8efb2e94a5825
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Feb 2 06:56:32 2017 +0100
src/sshmasterconnection.cpp: fix up some debug strings.
---
debian/changelog | 1 +
src/sshmasterconnection.cpp | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 225df66..1a9b5ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: use QString::arg () to insert function name
and thus deduplicate error translation messages. Also re-add the full
stop sign and remove it when needed for x2goDebug.
+ - src/sshmasterconnection.cpp: fix up some debug strings.
-- X2Go Release Manager <git-ad...@x2go.org> Wed, 22 Feb 2017 07:13:10 +0100
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 4178730..543be5c 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -173,9 +173,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent,
QString host, int por
breakLoop=false;
kerberosDelegation=false;
- x2goDebug << "SshMasterConnection, host " << host << "port " << port <<
"user " << user
- << "useproxy " << useproxy << "proxyserver " << proxyserver
- << "proxyport " << proxyport;
+ x2goDebug << "SshMasterConnection, host " << host << "; port " << port <<
"; user " << user
+ << "; useproxy " << useproxy << "; proxyserver " << proxyserver
+ << "; proxyport " << proxyport;
this->host=host;
this->port=port;
this->user=user;
@@ -467,7 +467,7 @@ void SshMasterConnection::run()
#endif
if(useproxy && proxytype==PROXYSSH)
{
- x2goDebug << "proxyserver: " << proxyserver << "proxyport: " <<
proxyport << "proxylogin: " << proxylogin;
+ x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " <<
proxyport << "; proxylogin: " << proxylogin;
sshProxy=new SshMasterConnection (0, proxyserver,
proxyport,acceptUnknownServers,
proxylogin, proxypassword, proxykey,
proxyautologin, proxyKrbLogin, false);
connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT (
slotSshProxyConnectionOk() ) );
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
