From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Jul 2015 18:14:03 +0000 (+0100)
Subject: Mirroring: Remove pointless empty .log files
X-Git-Tag: debian/1.0~28
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b7f362f25ab0d961df1e100af7d07165b5ecdfc3

Mirroring: Remove pointless empty .log files
---

diff --git a/infra/dgit-mirror-rsync b/infra/dgit-mirror-rsync
index 47142ee2..0d29ffb3 100755
--- a/infra/dgit-mirror-rsync
+++ b/infra/dgit-mirror-rsync
@@ -108,7 +108,11 @@ attempt () {
 	exec 3>&2 >"$queue/$package.err" 2>&1
 	if actually; then
 		rm -f "$queue/$package.a"
+		exec 2>&3 2>&1
 		mv -f "$queue/$package.err" "$queue/$package.log"
+		if ! [ -s "$queue/$package.log" ]; then
+			rm "$queue/$package.log"
+		fi
 		rm "$queue/$package.lock"
 	else
 		cat >&3 "$queue/$package.err"
diff --git a/tests/lib-mirror b/tests/lib-mirror
index c84c30c3..a61e02b0 100644
--- a/tests/lib-mirror
+++ b/tests/lib-mirror
@@ -29,7 +29,7 @@ t-check-mirrored () {
 	t-reporefs master
 	t-reporefs mirror $pmirror
 	diff $tmp/show-refs.{master,mirror}
-	cat $queuedir/$p.log
+	cat $queuedir/$p.log ||:
 	t-files-notexist $queuedir/$p.{n,a,lock,err}
 }