From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 18 Dec 2018 09:38:39 +0000 (+0100)
Subject: SyncEngine: Ensure that the paths passed to the discovery ends with slashes
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~369
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd410a5a847f75a1eeefa385b49367be48af8d32;p=nextcloud-desktop.git

SyncEngine: Ensure that the paths passed to the discovery ends with slashes

This was making the tx.pl test fail
---

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 1a96ed657..418d494fc 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -579,7 +579,11 @@ void SyncEngine::slotStartDiscovery()
     _discoveryPhase->_excludes = _excludedFiles.data();
     _discoveryPhase->_statedb = _journal;
     _discoveryPhase->_localDir = _localPath;
+    if (!_discoveryPhase->_localDir.endsWith('/'))
+        _discoveryPhase->_localDir+='/';
     _discoveryPhase->_remoteFolder = _remotePath;
+    if (!_discoveryPhase->_remoteFolder.endsWith('/'))
+        _discoveryPhase->_remoteFolder+='/';
     _discoveryPhase->_syncOptions = _syncOptions;
     _discoveryPhase->_shouldDiscoverLocaly = [this](const QString &s) { return shouldDiscoverLocally(s); };
     _discoveryPhase->_selectiveSyncBlackList = selectiveSyncBlackList;