[X2Go-Commits] [x2goclient] 265/280: src/onmainwindow.cpp: remove trailing slash from Mageia/SUSE/Arch sftp-server binary search path.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 18 12:26:20 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 818163d8b6ebcd730b13468aee96e141caa92475
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Dec 9 18:48:07 2016 +0100

    src/onmainwindow.cpp: remove trailing slash from Mageia/SUSE/Arch sftp-server binary search path.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e3450f..fcfd9f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -507,6 +507,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       binary locations.
     - src/{onmainwindow,pulsemanager}.cpp: actually *use* what we got back
       from add_to_path ()... Fixes a few bugs here and there.
+    - src/onmainwindow.cpp: remove trailing slash from Mageia/SUSE/Arch
+      sftp-server binary search path.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index db739ba..a3c9b9c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10201,7 +10201,7 @@ void ONMainWindow::generateEtcFiles()
     QStringList common_sftp_dirs;
     common_sftp_dirs << "/usr/lib/openssh" /* Debian and Ubuntu */
                      << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
-                     << "/usr/lib/ssh/" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
+                     << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
                      << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
                      << "/usr/lib/misc" /* Gentoo */
                      << "/usr/libexec"; /* Slackware, OS X */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list