From 726051b9d1a0d79f76f743b1dcb46ae0ace52c71 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Jun 2017 20:17:08 +0200 Subject: [PATCH] fix double delete in rebuild_refcounts in case of the Manifest having an IntegrityError, the entry for the manifest was already deleted. --- src/borg/archive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 91239bdcd..ecb34b06f 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -1328,8 +1328,8 @@ class ArchiveChecker: Missing and/or incorrect data is repaired when detected """ - # Exclude the manifest from chunks - del self.chunks[Manifest.MANIFEST_ID] + # Exclude the manifest from chunks (manifest entry might be already deleted from self.chunks) + self.chunks.pop(Manifest.MANIFEST_ID, None) def mark_as_possibly_superseded(id_): if self.chunks.get(id_, ChunkIndexEntry(0, 0, 0)).refcount == 0: