]> arthur.barton.de Git - bup.git/commitdiff
fsck: stop using .encode('hex')
authorJohannes Berg <johannes@sipsolutions.net>
Sat, 18 Apr 2020 21:28:59 +0000 (23:28 +0200)
committerRob Browning <rlb@defaultvalue.org>
Sun, 19 Apr 2020 20:52:20 +0000 (15:52 -0500)
An error path is using this still, use hexlify() instead.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
cmd/fsck-cmd.py

index 14a32c8ca8a691339275c198efa0b1661e7a5b3e..293024e8d81948492a857eef4d96903f1277ca66 100755 (executable)
@@ -10,6 +10,7 @@ import sys, os, glob, subprocess
 from shutil import rmtree
 from subprocess import PIPE, Popen
 from tempfile import mkdtemp
+from binascii import hexlify
 
 from bup import options, git
 from bup.compat import argv_bytes
@@ -109,7 +110,7 @@ def quick_verify(base):
     for b in chunkyreader(f, os.fstat(f.fileno()).st_size - 20):
         sum.update(b)
     if sum.digest() != wantsum:
-        raise ValueError('expected %r, got %r' % (wantsum.encode('hex'),
+        raise ValueError('expected %r, got %r' % (hexlify(wantsum),
                                                   sum.hexdigest()))