From 8549719df3775ca135f6f7a16af6cdabe58f7973 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Mon, 30 Dec 2019 10:17:10 +1100 Subject: [PATCH] Fix --dry-run output to be consistent when using --upload-only & --no-remote-delete (Issue #758) * Fix --dry-run output when using --upload-only & --no-remote-delete and deleting local files --- src/sync.d | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/sync.d b/src/sync.d index eaa4c72d..d65691b3 100644 --- a/src/sync.d +++ b/src/sync.d @@ -2194,7 +2194,7 @@ final class SyncEngine } else { uploadDeleteItem(item, path); } - } else { + } else { // file was found in the database // Did we 'fake create it' as part of --dry-run ? foreach (i; idsFaked) { @@ -2206,7 +2206,12 @@ final class SyncEngine } // item.id did not match a 'faked' download new file creation log.vlog("The file has been deleted locally"); - uploadDeleteItem(item, path); + if (noRemoteDelete) { + // do not process remote file delete + log.vlog("Skipping remote file delete as --upload-only & --no-remote-delete configured"); + } else { + uploadDeleteItem(item, path); + } } } }