gc: explicitly handle missing objects

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

diff --git a/cmd/gc-cmd.py b/cmd/gc-cmd.py
index a3cf60f8cb0264240f936585299b466776d50ee9..a95f8f63416d1ccec84f37eb303a9e7fcc92ae02 100755 (executable)
--- a/cmd/gc-cmd.py
+++ b/cmd/gc-cmd.py
@@ -6,7 +6,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 # end of bup preamble
 import glob, os, stat, subprocess, sys, tempfile
 from bup import bloom, git, midx, options, vfs
-from bup.git import walk_object
+from bup.git import MissingObject, walk_object
 from bup.helpers import handle_ctrl_c, log, progress, qprogress, saved_errors
 from os.path import basename
 
@@ -260,7 +260,11 @@ if not existing_count:
     if opt.verbose:
         log('nothing to collect\n')
 else:
-    live_objects = find_live_objects(existing_count, cat_pipe, opt)
+    try:
+        live_objects = find_live_objects(existing_count, cat_pipe, opt)
+    except MissingObject as ex:
+        log('bup: missing object %r \n' % ex.id.encode('hex'))
+        sys.exit(1)
     try:
         # FIXME: just rename midxes and bloom, and restore them at the end if
         # we didn't change any packs?