From 13db1b030de3b885468d2473dd3d432000b21f31 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Fri, 25 Sep 2020 10:32:55 -0300 Subject: Do not immediately restore deleted items When not using the deleted maildir flag messages would be restored immediately after the cloud was updated. This is because nmsgs was updated in the wrong order. Fixes: 131d182e0054 ("Add a --offline option") Signed-off-by: Jason Gunthorpe --- cloud_mdir_sync/main.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cloud_mdir_sync/main.py b/cloud_mdir_sync/main.py index 89daa11..db33af8 100644 --- a/cloud_mdir_sync/main.py +++ b/cloud_mdir_sync/main.py @@ -74,13 +74,15 @@ async def synchronize_mail(cfg: config.Config): for mbox in cfg.all_mboxes() if mbox.need_update)) - nmsgs = route_cloud_messages(cfg) if msgs is not None: await update_cloud_from_local(cfg, msgs) - elif cfg.args.OFFLINE: - await update_cloud_from_local(cfg, - nmsgs, - offline_mode=True) + nmsgs = route_cloud_messages(cfg) + else: + nmsgs = route_cloud_messages(cfg) + if cfg.args.OFFLINE: + await update_cloud_from_local(cfg, + nmsgs, + offline_mode=True) force_local_to_cloud(cfg, nmsgs) msgs = nmsgs -- cgit v1.2.3