Skip to content

Commit c1bf28d

Browse files
committed
Continue when bundle decryption fails
1 parent afa5e2c commit c1bf28d

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

syncrypt/app/syncrypt.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -764,9 +764,12 @@ def cb(_task):
764764
break
765765
total += 1
766766
store_hash, metadata, server_info = item
767-
bundle = yield from vault.add_bundle_by_metadata(store_hash, metadata)
768-
task = yield from self.pull_bundle(bundle)
769-
task.add_done_callback(cb)
767+
try:
768+
bundle = yield from vault.add_bundle_by_metadata(store_hash, metadata)
769+
task = yield from self.pull_bundle(bundle)
770+
task.add_done_callback(cb)
771+
except ValueError as e:
772+
logger.exception(e)
770773
latest_revision = server_info.get('id') or latest_revision
771774
yield from self.wait()
772775

@@ -780,7 +783,7 @@ def cb(_task):
780783
if latest_revision:
781784
vault.update_revision(latest_revision)
782785
else:
783-
logger.error('%s failures occured while pulling %d revisions for %s',
786+
logger.error('%s failure(s) occured while pulling %d revisions for %s',
784787
total - len(successful), total, vault)
785788

786789
@asyncio.coroutine

0 commit comments

Comments
 (0)