Change name of MissingObject id to oid

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/gc.py b/lib/bup/gc.py
index 1926522c612f7ecb8123543591a692d531c205f6..61300ec1076df0becd5e3614aa4c39c167e7ce7a 100644 (file)
--- a/lib/bup/gc.py
+++ b/lib/bup/gc.py
@@ -225,7 +225,7 @@ def bup_gc(threshold=10, compression=1, verbosity=0):
             live_objects = find_live_objects(existing_count, cat_pipe,
                                              verbosity=verbosity)
         except MissingObject as ex:
-            log('bup: missing object %r \n' % ex.id.encode('hex'))
+            log('bup: missing object %r \n' % ex.oid.encode('hex'))
             sys.exit(1)
         try:
             # FIXME: just rename midxes and bloom, and restore them at the end if

diff --git a/lib/bup/git.py b/lib/bup/git.py
index 6787ac0a1cffa52e9dc9baf382c9f142e28bead1..12755234bc91eccfa8ecbf30f131458e8830da3e 100644 (file)
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -1258,9 +1258,9 @@ def tags(repo_dir = None):
 
 
 class MissingObject(KeyError):
-    def __init__(self, id):
-        self.id = id
-        KeyError.__init__(self, 'object %r is missing' % id.encode('hex'))
+    def __init__(self, oid):
+        self.oid = oid
+        KeyError.__init__(self, 'object %r is missing' % oid.encode('hex'))
 
 
 WalkItem = namedtuple('WalkItem', ['id', 'type', 'mode',