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

Fix deadlock in vdirsyncer discover

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-10-30 19:21:02 +01:00
parent 59078f05da
commit 130a5a6cc2
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vdirsyncer/cli/__init__.py
View file

@ -203,6 +203,7 @@ def discover(ctx, pairs, max_workers):
wq = WorkerQueue(max_workers) wq = WorkerQueue(max_workers)
with wq.join(): with wq.join():
print("PAIRS", pairs)
for pair_name in (pairs or config.pairs): for pair_name in (pairs or config.pairs):
pair = config.get_pair(pair_name) pair = config.get_pair(pair_name)

11
vdirsyncer/cli/config.py
View file

@ -204,11 +204,16 @@ class PairConfig(object):
self._config = config self._config = config
self.name = name self.name = name
self.name_a = name_a self.name_a = name_a
self.name_a = name_b self.name_b = name_b
self.options = pair_options self.options = pair_options
self.config_a = config.get_storage_args(name_a, pair_name=name) @cached_property
self.config_b = config.get_storage_args(name_b, pair_name=name) def config_a(self):
return self._config.get_storage_args(self.name_a, pair_name=self.name)
@cached_property
def config_b(self):
return self._config.get_storage_args(self.name_b, pair_name=self.name)
class CollectionConfig(object): class CollectionConfig(object):