From 3ea16b619fed9b9d04c48cc80904f4910b2b4ac9 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Sat, 13 Feb 2021 17:37:22 +1100 Subject: [PATCH] Revert the config & logpath change and check correct input entry (#1270) * Revert the config & logpath change introduced via #1267 as the logging path should not be the value checked, the input path is what should be checked --- src/main.d | 2 -- src/sync.d | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.d b/src/main.d index 56187ee8..18199c20 100644 --- a/src/main.d +++ b/src/main.d @@ -453,8 +453,6 @@ int main(string[] args) // vdebug syncDir as set and calculated log.vdebug("syncDir: ", syncDir); - // As we use the cfg value of sync_dir elsewhere, and if it includes a ~ it is now correctly expanded, update the configuration with new expanded value - cfg.setValueString("sync_dir", syncDir); // Configure the logging directory if different from application default // log_dir environment handling to handle ~ expansion properly diff --git a/src/sync.d b/src/sync.d index b897f089..f1b687a5 100644 --- a/src/sync.d +++ b/src/sync.d @@ -2973,7 +2973,7 @@ final class SyncEngine } // scan for changes in the path provided - if (isDir(logPath)) { + if (isDir(path)) { // if this path is a directory, output this message. // if a file, potentially leads to confusion as to what the client is actually doing log.vlog("Uploading differences of ", logPath); @@ -3095,7 +3095,7 @@ final class SyncEngine } // scan for changes in the path provided - if (isDir(logPath)) { + if (isDir(path)) { // if this path is a directory, output this message. // if a file, potentially leads to confusion as to what the client is actually doing log.vlog("Uploading new items of ", logPath);