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 shitty exception

Browse source
This commit is contained in:
Markus Unterwaditzer 2017-04-13 18:41:37 +02:00
parent b0cd233f81
commit 97708ab3da
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vdirsyncer/cli/config.py
View file

@ -273,6 +273,9 @@ class PairConfig(object):
@cached_property @cached_property
def partial_sync(self): def partial_sync(self):
partial_sync = self._partial_sync partial_sync = self._partial_sync
# We need to use UserError here because ValueError is not
# caught at the time this is expanded.
if partial_sync is not None: if partial_sync is not None:
cls_a, _ = storage_class_from_config(self.config_a) cls_a, _ = storage_class_from_config(self.config_a)
cls_b, _ = storage_class_from_config(self.config_b) cls_b, _ = storage_class_from_config(self.config_b)
@ -281,14 +284,17 @@ class PairConfig(object):
not self.config_a.get('read_only', False) and \ not self.config_a.get('read_only', False) and \
not cls_b.read_only and \ not cls_b.read_only and \
not self.config_b.get('read_only', False): not self.config_b.get('read_only', False):
raise ValueError('`partial_sync` is only effective if one ' raise exceptions.UserError(
'storage is read-only.') '`partial_sync` is only effective if one storage is '
'read-only. Use `read_only = true` in exactly one storage '
'section.'
)
if partial_sync is None: if partial_sync is None:
partial_sync = 'revert' partial_sync = 'revert'
if partial_sync not in ('ignore', 'revert', 'error'): if partial_sync not in ('ignore', 'revert', 'error'):
raise ValueError('Invalid value for `partial_sync`.') raise exceptions.UserError('Invalid value for `partial_sync`.')
return partial_sync return partial_sync