Fix tindex for python 3

[bup.git] / lib / bup / gc.py

diff --git a/lib/bup/gc.py b/lib/bup/gc.py
index 5a351f579750790968e547795b9d54b84dcc4d62..a70339eb1ebb6af50caf0f469c60ecd79b4a7de1 100644 (file)
--- a/lib/bup/gc.py
+++ b/lib/bup/gc.py
@@ -105,7 +105,7 @@ def find_live_objects(existing_count, cat_pipe, verbosity=0):
         stop_at = lambda x: x.decode('hex') in trees_visited
     approx_live_count = 0
     for ref_name, ref_id in git.list_refs():
-        for item in walk_object(cat_pipe, ref_id.encode('hex'),
+        for item in walk_object(cat_pipe.get, ref_id.encode('hex'),
                                 stop_at=stop_at,
                                 include_data=None):
             # FIXME: batch ids
@@ -239,7 +239,7 @@ def bup_gc(threshold=10, compression=1, verbosity=0):
             bloom.clear_bloom(packdir)
             if verbosity: log('clearing reflog\n')
             expirelog_cmd = ['git', 'reflog', 'expire', '--all', '--expire=all']
-            expirelog = subprocess.Popen(expirelog_cmd, preexec_fn = git._gitenv())
+            expirelog = subprocess.Popen(expirelog_cmd, env=git._gitenv())
             git._git_wait(' '.join(expirelog_cmd), expirelog)
             if verbosity: log('removing unreachable data\n')
             sweep(live_objects, existing_count, cat_pipe,