From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 6 Jan 2010 21:42:54 +0000 (-0500)
Subject: splitting to a remote server would cause "already busy" errors.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0f296c0eb7e9130a73f4b4c8c66fe7cd86cd4c1d;p=packages%2Fb%2Fbup.git

splitting to a remote server would cause "already busy" errors.

Specifically:
	client.ClientError: already busy with command 'receive-objects'

That's because recent changes removed the call to onclose() from
PackWriter_Remote.  Now it's back, plus I added an extra unit test to reveal
the problem.
---

diff --git a/client.py b/client.py
index ad4fd2d..c8e0818 100644
--- a/client.py
+++ b/client.py
@@ -199,6 +199,8 @@ class PackWriter_Remote(git.PackWriter):
             id = self.file.readline().strip()
             self.file.check_ok()
             self.objcache = None
+            if self.onclose:
+                self.onclose()
             return id
 
     def close(self):
diff --git a/test-sh b/test-sh
index 91fde59..d2583a7 100755
--- a/test-sh
+++ b/test-sh
@@ -18,6 +18,7 @@ bup split -vvvv -b testfile2 >tags2.tmp
 bup split -t testfile2 >tags2t.tmp
 bup split -t testfile2 --fanout 3 >tags2tf.tmp
 bup split -r "$BUP_DIR" -c testfile2 >tags2c.tmp
+ls -lR | bup split -r "$BUP_DIR" -c --fanout 3 --max-pack-objects 3 -n lslr
 diff -u tags1.tmp tags2.tmp || true
 if diff -q tags2t.tmp tags2tf.tmp; then
     echo "fanout tree same as non-fanout tree!?"