[PATCH 1/4] CatPipe.get: check inprogress with a single assertion

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
lib/bup/git.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/bup/git.py b/lib/bup/git.py
index 1be96a4c..2b13be06 100644
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -1399,10 +1399,9 @@ class CatPipe:
self.restart()
assert(self.p)
poll_result = self.p.poll()
- assert(poll_result == None)
- if self.inprogress:
- log('get: opening %r while %r is open\n' % (ref, self.inprogress))
- assert(not self.inprogress)
+ assert poll_result is None
+ assert not self.inprogress, \
+ f'opening {ref.decode("ascii")} while {self.inprogress.decode("ascii")} is open'
assert ref.find(b'\n') < 0
assert ref.find(b'\r') < 0
assert not ref.startswith(b'-')
--
2.47.2