From e7740458cd549b746b1b102d9459a4fa0fac1749 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Mon, 4 Jul 2016 00:44:25 +0200 Subject: [PATCH] Repository: Read v2 hints files Fixes #1235 --- borg/repository.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/borg/repository.py b/borg/repository.py index 275802751..fa3919f61 100644 --- a/borg/repository.py +++ b/borg/repository.py @@ -219,10 +219,14 @@ def prepare_txn(self, transaction_id, do_cleanup=True): self.io.cleanup(transaction_id) with open(os.path.join(self.path, 'hints.%d' % transaction_id), 'rb') as fd: hints = msgpack.unpack(fd) - if hints[b'version'] != 1: + hints_version = hints[b'version'] + if hints_version not in (1, 2): raise ValueError('Unknown hints file version: %d' % hints['version']) self.segments = hints[b'segments'] - self.compact = set(hints[b'compact']) + if hints_version == 1: + self.compact = set(hints[b'compact']) + elif hints_version == 2: + self.compact = set(hints[b'compact'].keys()) def write_index(self): hints = {b'version': 1,