Bail out immediately instead of redownloading .idx

This should make diagnosing / fixing corrupted bloom filters and midx
files easier, and is generally more sane behavior.

Signed-off-by: Brandon Low <lostlogic@lostlogicx.com>

diff --git a/lib/bup/client.py b/lib/bup/client.py
index 8d2fbb99fef23c4755ac8c32ed5542993f1400fa..e773c66049550af9bfd4791788ab1bf2b709e428 100644 (file)
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -182,10 +182,13 @@ class Client:
         #debug1('requesting %r\n' % name)
         self.check_busy()
         mkdirp(self.cachedir)
+        fn = os.path.join(self.cachedir, name)
+        if os.path.exists(fn):
+            msg = "won't request existing .idx, try `bup bloom --check %s`" % fn
+            raise ClientError(msg)
         self.conn.write('send-index %s\n' % name)
         n = struct.unpack('!I', self.conn.read(4))[0]
         assert(n)
-        fn = os.path.join(self.cachedir, name)
         f = open(fn + '.tmp', 'w')
         count = 0
         progress('Receiving index from server: %d/%d\r' % (count, n))