The change for the server index is unproblematic, I think, but
the hidden bloom message results in "bup bloom --dir" (which
"bup save" calls) to exit without a message -- but makes "bup save"
much nicer ... hm.
Can we check if "bup bloom" has been called by "bup save"?
if tfname:
os.rename(tfname, outfilename)
+ if opt.dir:
+ # Hide progress message when using "--dir", which "bup save" does ...
+ progress_update('Bloom filter: %s%s %d file%s (%d object%s), done.'
+ % (dirprefix, msg,
+ len(add), len(add)!=1 and 's' or '',
+ add_count, add_count!=1 and 's' or ''))
+ return
progress_end('Bloom filter: %s%s %d file%s (%d object%s), done.'
% (dirprefix, msg,
len(add), len(add)!=1 and 's' or '',
f.write(b)
count += len(b)
progress_update('Receiving index from server: %d/%d ...' % (count, n), False)
- progress_end('Receiving index from server: %d/%d, done.' % (count, n))
+ progress_update('Receiving index from server: %d/%d, done.' % (count, n))
self.check_ok()
def _make_objcache(self):