From 943c97028630cf6aaffa67a90abc67e6aa65f943 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 15 Feb 2015 21:29:58 +0100 Subject: [PATCH] Don't rediscover if conflict_resolution changed --- vdirsyncer/cli/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py index e0e2646..9867cc8 100644 --- a/vdirsyncer/cli/utils.py +++ b/vdirsyncer/cli/utils.py @@ -114,7 +114,10 @@ def get_status_name(pair, collection): def _get_collections_cache_key(pair_options, config_a, config_b): m = hashlib.sha256() - j = json.dumps([pair_options, config_a, config_b], sort_keys=True) + j = json.dumps([ + pair_options.get('collections', None), + config_a, config_b + ], sort_keys=True) m.update(j.encode('utf-8')) return m.hexdigest()