sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-03-25 08:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent setting partial_sync if nothing read-only.

Browse source
This commit is contained in:
Markus Unterwaditzer 2016-10-04 18:55:47 +02:00
parent 15bf13cfe1
commit a5eec6193b
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vdirsyncer/cli/config.py
View file

@ -252,6 +252,9 @@ class PairConfig(object):
self.name_a = options.pop('a')
self.name_b = options.pop('b')
self.config_a = self._config.get_storage_args(self.name_a)
self.config_b = self._config.get_storage_args(self.name_b)
self._set_conflict_resolution(options)
self._set_partial_sync(options)
self._set_collections(options)
@ -260,9 +263,6 @@ class PairConfig(object):
if options:
raise ValueError('Unknown options: {}'.format(', '.join(options)))
self.config_a = self._config.get_storage_args(self.name_a)
self.config_b = self._config.get_storage_args(self.name_b)
def _set_conflict_resolution(self, options):
conflict_resolution = options.pop('conflict_resolution', None)
if conflict_resolution in (None, 'a wins', 'b wins'):
@ -286,10 +286,21 @@ class PairConfig(object):
raise ValueError('Invalid value for `conflict_resolution`.')
def _set_partial_sync(self, options):
self.partial_sync = options.pop('partial_sync', 'revert')
if self.partial_sync not in ('ignore', 'revert', 'error'):
partial_sync = options.pop('partial_sync', None)
if partial_sync is not None and \
not self.config_a.get('read_only', False) and \
not self.config_b.get('read_only', False):
raise ValueError('`partial_sync` is only effective if one storage '
'is read-only.')
if partial_sync is None:
partial_sync = 'revert'
if partial_sync not in ('ignore', 'revert', 'error'):
raise ValueError('Invalid value for `partial_sync`.')
self.partial_sync = partial_sync
def _set_collections(self, options):
try:
self.collections = options.pop('collections')