This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 742205c src/onmainwindow.cpp: work around changed SSH host key locations in OS X 10.11+. Fixes: #1079. new a513cb0 src/onmainwindow.cpp: fix last commit by using QFileInfo instead of QDir. 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/onmainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 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 master in repository x2goclient. commit a513cb08cb0b11bca40ef9ef767c06a7e6b534c7 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 27 20:51:22 2016 +0200 src/onmainwindow.cpp: fix last commit by using QFileInfo instead of QDir. This lets us use the exists () member function correctly. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 394a8dd..e3c5559 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium add_to_path (). - src/onmainwindow.cpp: work around changed SSH host key locations in OS X 10.11+. Fixes: #1079. Also check /etc/ssh/ for keys. + - src/onmainwindow.cpp: fix last commit by using QFileInfo instead of + QDir. This lets us use the exists () member function correctly. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b4413f0..1042b58 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8061,10 +8061,10 @@ QString ONMainWindow::createRSAKey() #ifdef Q_OS_DARWIN { /* OS X 10.11+ changed the key location to /etc/ssh/. */ - QDir rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub"); + QFileInfo rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub"); if (!(rsa_host_key.exists ())) { - rsa_host_key = QDir ("/etc/ssh_host_rsa_key.pub"); + rsa_host_key = QFileInfo ("/etc/ssh_host_rsa_key.pub"); if (!(rsa_host_key.exists ())) { printSshDError_noHostPubKey (); @@ -8072,7 +8072,7 @@ QString ONMainWindow::createRSAKey() } } - rsa.setFileName (rsa_host_key.absolutePath ()); + rsa.setFileName (rsa_host_key.absoluteFilePath ()); } #endif if ( !rsa.open ( QIODevice::ReadOnly | QIODevice::Text ) ) -- 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