fsck: stop using .encode('hex')

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>

diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
index 14a32c8ca8a691339275c198efa0b1661e7a5b3e..293024e8d81948492a857eef4d96903f1277ca66 100755 (executable)
--- a/cmd/fsck-cmd.py
+++ b/cmd/fsck-cmd.py
@@ -10,6 +10,7 @@ import sys, os, glob, subprocess
 from shutil import rmtree
 from subprocess import PIPE, Popen
 from tempfile import mkdtemp
 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
 
 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:
     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()))
         
 
                                                   sum.hexdigest()))