From 11e02461d25b9e1780b3bab1915cdbc7189838b7 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Fri, 8 Jul 2016 13:29:48 +0200 Subject: [PATCH] 1.0-maint merge fixup (hexlify..decode -> bin_to_hex) --- 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 3e844f016..90df7f162 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -597,7 +597,7 @@ Number of files: {0.stats.nfiles}'''.format( try: self.cache.chunk_decref(id, stats) except KeyError: - cid = hexlify(id).decode('ascii') + cid = bin_to_hex(id) raise ChunksIndexError(cid) except Repository.ObjectNotFound as e: # object not in repo - strange, but we wanted to delete it anyway.