From 8a44b278d12645d6256fc188962ae8b4d0f05021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Fri, 14 Jan 2022 13:07:28 +0200 Subject: [PATCH] vdirsyncer/metasync.py: for read_only storages adjust the metadata resolution in favour of the read_only storage --- vdirsyncer/metasync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdirsyncer/metasync.py b/vdirsyncer/metasync.py index 95371ff..cf5a282 100644 --- a/vdirsyncer/metasync.py +++ b/vdirsyncer/metasync.py @@ -55,7 +55,7 @@ async def metasync(storage_a, storage_b, status, keys, conflict_resolution=None) logger.debug(f"B: {b}") logger.debug(f"S: {s}") - if a != s and b != s: + if a != s and b != s or storage_a.read_only or storage_b.read_only: await _resolve_conflict() elif a != s and b == s: await _a_to_b()