From 0453ccadc5cad2e7a23cd519c255320602dc8c66 Mon Sep 17 00:00:00 2001 From: Sam Schott Date: Fri, 10 Apr 2020 22:20:25 +0200 Subject: [PATCH] updated changelog --- CHANGELOG.md | 3 ++- maestral/sync.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dbef867..3c707867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,10 @@ - Fixes a minor issue where internet connection errors while resuming syncing could result in continuous retries of the upload until the connection was finally established. - Instead, Maestral now pauses all syncing until a connection can be stablished. + Instead, Maestral now pauses all syncing until a connection can be established. - Fixes handling of errors when starting a file system watch such as inofify limit and permission errors. +- Fixes a rare issue which could lead to false conflicting copies of folders. - Fixes handling of errors from too long file names. - Fixes handling of some uncaught insufficient disk space errors. - Fixes autostart module on macOS. diff --git a/maestral/sync.py b/maestral/sync.py index d8c73b1a..43c64b4c 100644 --- a/maestral/sync.py +++ b/maestral/sync.py @@ -1468,6 +1468,8 @@ class UpDownSync: # conflicts due to race conditions when a file inside a folder is created in # between the conflict check and subsequent upload of the folder (see issue #116) + sorted_events['dir_created'].sort(key=lambda x: x.src_path.count('/')) + for event in sorted_events['dir_created']: self.create_remote_entry(event)