cleanup-mounts-under: Don't fail when /proc/mounts isn't readable

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

diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
index 4d44dc73cdbc864d020f47f556ffb702b30199df..794c755b4c424d468cae7210a8447b16c0b51c0e 100755 (executable)
--- a/cmd/fsck-cmd.py
+++ b/cmd/fsck-cmd.py
@@ -79,7 +79,7 @@ def git_verify(base):
         return run(['git', 'verify-pack', '--', base])
     
     
-def do_pack(base, last):
+def do_pack(base, last, par2_exists):
     code = 0
     if par2_ok and par2_exists and (opt.repair or not opt.generate):
         vresult = par2_verify(base)
@@ -119,10 +119,7 @@ def do_pack(base, last):
                 action_result = 'ok'
     else:
         assert(opt.generate and (not par2_ok or par2_exists))
-        if par2_ok:
-            action_result = 'exists'
-        else:
-            action_result = 'skipped'
+        action_result = 'exists' if par2_exists else 'skipped'
     if opt.verbose:
         print last, action_result
     return code
@@ -182,7 +179,7 @@ for name in extra:
         progress('fsck (%d/%d)\r' % (count, len(extra)))
     
     if not opt.jobs:
-        nc = do_pack(base, last)
+        nc = do_pack(base, last, par2_exists)
         code = code or nc
         count += 1
     else:
@@ -198,7 +195,7 @@ for name in extra:
             outstanding[pid] = 1
         else: # child
             try:
-                sys.exit(do_pack(base, last))
+                sys.exit(do_pack(base, last, par2_exists))
             except Exception, e:
                 log('exception: %r\n' % e)
                 sys.exit(99)