X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-mirror-rsync;h=2d912c8ad1dd30f335c2f52d8e4f6011a718a22c;hb=1ac54873fc4d702267404d5ea792a70f0b46d96d;hp=f2796f4b7faf10fd8a99373e7fda4eb854426154;hpb=ab6ac4334b8aa5eb297f898ed791824a4c0ceefa;p=dgit.git

diff --git a/infra/dgit-mirror-rsync b/infra/dgit-mirror-rsync
index f2796f4b..2d912c8a 100755
--- a/infra/dgit-mirror-rsync
+++ b/infra/dgit-mirror-rsync
@@ -26,7 +26,7 @@ set -o pipefail
 shopt -s nullglob
 
 case "$DGIT_DRS_DEBUG" in
-''|0!1)		;;
+''|0|1)		;;
 *)		set -x	;;
 esac
 
@@ -54,6 +54,7 @@ rsync=(rsync -rltH --safe-links --delete)
 hooktimeout=30
 rsynctimeout=900
 rsyncssh='ssh -o batchmode=yes'
+mirror_gc_cmd='git gc --auto'
 
 . $distrodir/mirror-settings
 
@@ -74,6 +75,12 @@ case "$remoterepos" in
 esac
 
 actually () {
+	if [ "x$mirror_gc_cmd" != x ]; then
+		(
+			cd "$repos/$package.git"
+			$mirror_gc_cmd
+		)
+	fi
 	"${rsync[@]}" \
 		--timeout=$rsynctimeout				\
 		-e "$rsyncssh"					\
@@ -91,7 +98,7 @@ reinvoke () {
 
 check-package-mirrorable () {
 	local repo=$repos/$package.git
-	local mode=$(stat -c%a "$repo")
+	local mode; mode=$(stat -c%a "$repo")
 	case $mode in
 	*5)	return	0	;;
 	*0)	return	1	;;
@@ -108,7 +115,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"
@@ -146,7 +157,7 @@ reinvoke-locked)
 
 backlog)
 	for f in $queue/*.[na]; do
-		(lock-and-process-baseof-f)
+		(lock-and-process-baseof-f ||:)
 	done
 	;;