Merge remote branch 'origin/master' into meta

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

diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
index 36c8a350a0c524c1f94356c6f549b6c1dd16056a..44decd894e7983d4f20438ec59ecef61f0c4cb54 100755 (executable)
--- a/cmd/fsck-cmd.py
+++ b/cmd/fsck-cmd.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, os, glob, subprocess, time, sha
+import sys, os, glob, subprocess
 from bup import options, git
 from bup.helpers import *
 
@@ -59,7 +59,7 @@ def quick_verify(base):
     wantsum = f.read(20)
     assert(len(wantsum) == 20)
     f.seek(0)
-    sum = sha.sha()
+    sum = Sha1()
     for b in chunkyreader(f, os.fstat(f.fileno()).st_size - 20):
         sum.update(b)
     if sum.digest() != wantsum:
@@ -104,8 +104,14 @@ def do_pack(base, last):
             code = gresult
         else:
             if par2_ok and opt.generate:
-                par2_generate(base)
-            print '%s ok' % last
+                presult = par2_generate(base)
+                if presult != 0:
+                    print '%s par2 create: failed (%d)' % (last, presult)
+                    code = presult
+                else:
+                    print '%s ok' % last
+            else:
+                print '%s ok' % last
     else:
         assert(opt.generate and (not par2_ok or par2_exists))
         debug('    skipped: par2 file already generated.\n')
@@ -123,7 +129,7 @@ j,jobs=     run 'n' jobs in parallel
 par2-ok     immediately return 0 if par2 is ok, 1 if not
 disable-par2  ignore par2 even if it is available
 """
-o = options.Options('bup fsck', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 par2_setup()