From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 3 Mar 2013 22:51:14 +0000 (-0600)
Subject: Fix use of Python assert() with respect to optimization.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c532cf07abbff52a0506bf2baf58a35f32f0981d;p=packages%2Fb%2Fbup.git

Fix use of Python assert() with respect to optimization.

Fix a number of places where bup's assertions had material
side-effects, or where other code expected to see the AssertionError,
neither of which happen when optimization is enabled.

Reported-by: Jon Dowland <jmtd@debian.org>
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
index 1243c8d..62011e4 100755
--- a/cmd/midx-cmd.py
+++ b/cmd/midx-cmd.py
@@ -135,7 +135,8 @@ def _do_midx(outdir, outfilename, infilenames, prefixstr):
         print p.idxnames
         assert(len(p) == total)
         for pe, e in p, git.idxmerge(inp, final_progress=False):
-            assert(i == pi.next())
+            pin = pi.next()
+            assert(i == pin)
             assert(p.exists(i))
 
     return total, outfilename
diff --git a/lib/bup/client.py b/lib/bup/client.py
index c2c83e2..7f9334b 100644
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -40,7 +40,8 @@ def parse_remote(remote):
     url_match = re.match(
             '%s(?:%s%s)?%s' % (protocol, host, port, path), remote, re.I)
     if url_match:
-        assert(url_match.group(1) in ('ssh', 'bup', 'file'))
+        if not url_match.group(1) in ('ssh', 'bup', 'file'):
+            raise ClientError, 'unexpected protocol: %s' % url_match.group(1)
         return url_match.group(1,3,4,5)
     else:
         rs = remote.split(':', 1)
diff --git a/lib/bup/git.py b/lib/bup/git.py
index ad4668b..403b969 100644
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -962,7 +962,8 @@ class CatPipe:
         if not self.p or self.p.poll() != None:
             self._restart()
         assert(self.p)
-        assert(self.p.poll() == None)
+        poll_result = self.p.poll()
+        assert(poll_result == None)
         if self.inprogress:
             log('_fast_get: opening %r while %r is open\n'
                 % (id, self.inprogress))
@@ -988,7 +989,8 @@ class CatPipe:
             yield type
             for blob in it:
                 yield blob
-            assert(self.p.stdout.readline() == '\n')
+            readline_result = self.p.stdout.readline()
+            assert(readline_result == '\n')
             self.inprogress = None
         except Exception, e:
             it.abort()
diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index ca9358a..c136aeb 100644
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -741,7 +741,8 @@ def path_components(path):
     full_path_to_name).  Path must start with '/'.
     Example:
       '/home/foo' -> [('', '/'), ('home', '/home'), ('foo', '/home/foo')]"""
-    assert(path.startswith('/'))
+    if not path.startswith('/'):
+        raise Exception, 'path must start with "/": %s' % path
     # Since we assume path startswith('/'), we can skip the first element.
     result = [('', '/')]
     norm_path = os.path.abspath(path)
diff --git a/lib/bup/t/tclient.py b/lib/bup/t/tclient.py
index 85dd8b2..78d845c 100644
--- a/lib/bup/t/tclient.py
+++ b/lib/bup/t/tclient.py
@@ -144,5 +144,5 @@ def test_remote_parsing():
     try:
         client.parse_remote('http://asdf.com/bup')
         WVFAIL()
-    except AssertionError:
+    except client.ClientError:
         WVPASS()