From 57a2d920cb0e395a8f4feefe4770d0c7eee7f649 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 16 Dec 2017 01:16:05 +0100 Subject: [PATCH] check --repair: fix malfunctioning validator, fixes #3444 the major problem was the ('path' in item) expression. the dict has bytes-typed keys there, so it never succeeded as it looked for a str key. this is a 1.1 regression, 1.0 was fine. the dict -> StableDict change is just for being more specific, the check triggered correctly as StableDict subclasses dict, it was just a bit too general. (cherry picked from commit e09892caec8a63d59e909518c4e9c230dbd69774) --- src/borg/archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 6c0de3622..2a007f736 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -1585,7 +1585,7 @@ class ArchiveChecker: """ item_keys = frozenset(key.encode() for key in self.manifest.item_keys) required_item_keys = frozenset(key.encode() for key in REQUIRED_ITEM_KEYS) - unpacker = RobustUnpacker(lambda item: isinstance(item, dict) and 'path' in item, + unpacker = RobustUnpacker(lambda item: isinstance(item, StableDict) and b'path' in item, self.manifest.item_keys) _state = 0