sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't rediscover if conflict_resolution changed

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-02-15 21:29:58 +01:00
parent f7f271afe2
commit 943c970286
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vdirsyncer/cli/utils.py
View file

@ -114,7 +114,10 @@ def get_status_name(pair, collection):
def _get_collections_cache_key(pair_options, config_a, config_b): def _get_collections_cache_key(pair_options, config_a, config_b):
m = hashlib.sha256() 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')) m.update(j.encode('utf-8'))
return m.hexdigest() return m.hexdigest()