From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 16 Dec 2016 18:27:27 +0000 (-0600)
Subject: gc: immediately unlink tmp bloom filter file
X-Git-Tag: 0.29-rc1~4
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=8815d8ac4c4b6b9b4df94790b81ff95db030f1d1;hp=2e9f45769f9161d06ce9db7651f4ee9cbe6bc3bd

gc: immediately unlink tmp bloom filter file

...to make sure the bloom filter is always cleaned up on exit.

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 28ffac6..446092f 100644
--- a/lib/bup/gc.py
+++ b/lib/bup/gc.py
@@ -94,6 +94,8 @@ def find_live_objects(existing_count, cat_pipe, verbosity=0):
     # FIXME: allow selection of k?
     # FIXME: support ephemeral bloom filters (i.e. *never* written to disk)
     live_objs = bloom.create(bloom_filename, expected=existing_count, k=None)
+    # live_objs will hold on to the fd until close or exit
+    os.unlink(bloom_filename)
     stop_at, trees_visited = None, None
     if prune_visited_trees:
         trees_visited = set()
@@ -238,4 +240,3 @@ def bup_gc(threshold=10, compression=1, verbosity=0):
                   verbosity)
         finally:
             live_objects.close()
-            os.unlink(live_objects.name)