-#!/usr/bin/env python
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
import sys, glob, tempfile
from bup import options, git, bloom
from bup.helpers import *
if b:
if len(b) != rest_count:
- log("bloom: size %d != idx total %d, regenerating\n"
- % (len(b), rest_count))
+ debug1("bloom: size %d != idx total %d, regenerating\n"
+ % (len(b), rest_count))
b = None
elif (b.bits < bloom.MAX_BLOOM_BITS and
b.pfalse_positive(add_count) > bloom.MAX_PFALSE_POSITIVE):
- log("bloom: regenerating: adding %d entries gives "
- "%.2f%% false positives.\n"
- % (add_count, b.pfalse_positive(add_count)))
+ debug1("bloom: regenerating: adding %d entries gives "
+ "%.2f%% false positives.\n"
+ % (add_count, b.pfalse_positive(add_count)))
b = None
else:
b = bloom.ShaBloom(outfilename, readwrite=True, expected=add_count)
msg = b is None and 'creating from' or 'adding'
if not _first: _first = path
dirprefix = (_first != path) and git.repo_rel(path)+': ' or ''
- log('bloom: %s%s %d file%s (%d object%s).\n'
+ progress('bloom: %s%s %d file%s (%d object%s).\n'
% (dirprefix, msg,
len(add), len(add)!=1 and 's' or '',
add_count, add_count!=1 and 's' or ''))
tfname = None
if b is None:
tfname = os.path.join(path, 'bup.tmp.bloom')
- tf = open(tfname, 'w+')
- b = bloom.create(tfname, f=tf, expected=add_count, k=opt.k)
+ b = bloom.create(tfname, expected=add_count, k=opt.k)
count = 0
icount = 0
for name in add:
count += 1
icount += len(ix)
+ # Currently, there's an open file object for tfname inside b.
+ # Make sure it's closed before rename.
+ b.close()
+
if tfname:
os.rename(tfname, outfilename)
log('WARNING: %d errors encountered during bloom.\n' % len(saved_errors))
sys.exit(1)
elif opt.check:
- log('all tests passed.\n')
+ log('All tests passed.\n')