fsck: stop using .encode('hex')

[bup.git] / cmd / fsck-cmd.py

diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
index b97a1d7dab63763efc1f92c20388c4d886f07e01..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 binascii import hexlify
 
 from bup import options, git
 from bup.compat import argv_bytes
@@ -61,9 +62,9 @@ def is_par2_parallel():
         _, err = p.communicate()
         parallel = p.returncode == 0
         if opt.verbose:
-            if err != b'Invalid option specified: -t1\n':
+            if len(err) > 0 and err != b'Invalid option specified: -t1\n':
                 log('Unexpected par2 error output\n')
-                log(repr(err))
+                log(repr(err) + '\n')
             if parallel:
                 log('Assuming par2 supports parallel processing\n')
             else:
@@ -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()))