Adjust to makeDbName returning an absolute path
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 8 Jul 2020 09:18:07 +0000 (11:18 +0200)
committerKevin Ottens <ervin@ipsquad.net>
Wed, 8 Jul 2020 11:09:13 +0000 (13:09 +0200)
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>
src/cmd/cmd.cpp

index a56e9e2f7758658128ad673f34ee1d8a975e65f8..cf95be836a9b4d9df7f36581d021858e86673f35 100644 (file)
@@ -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()) {