From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 8 Jul 2020 09:18:07 +0000 (+0200)
Subject: Adjust to makeDbName returning an absolute path
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~104
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2492e241ac1b22cfbdbcb97739e9365fba69ac22;p=nextcloud-desktop.git

Adjust to makeDbName returning an absolute path

PR #1451 changed the behavior of makeDbName which now returns an
absolute path. This obviously then failed in nextcloudcmd which
prepended to it the path to the local folder to sync. We just stop doing
this to have the journal db end up at the right place in that case as
well.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index a56e9e2f7..cf95be836 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -499,7 +499,7 @@ restart_sync:
     }
 
     Cmd cmd;
-    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(credentialFreeUrl, folder, user);
+    QString dbPath = SyncJournalDb::makeDbName(credentialFreeUrl, folder, user);
     SyncJournalDb db(dbPath);
 
     if (!selectiveSyncList.empty()) {