Mirroring: Remove pointless empty .log files

diff --git a/infra/dgit-mirror-rsync b/infra/dgit-mirror-rsync
index 47142ee296beecf4eb93c57e7cf92687dc11f01a..0d29ffb3e65621b3fec1f468bd0d64c5d90f3772 100755 (executable)
--- 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 c84c30c33edc3d3e81f0f1ac287c92733f0ebcde..a61e02b0a185c2fab045d25f51d0a10822c6d44e 100644 (file)
--- 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}
 }