X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-mirror-rsync;h=2d912c8ad1dd30f335c2f52d8e4f6011a718a22c;hp=e73d9a5bcf982fd109902973a4f310f843bf7c67;hb=f1d68d5945334f10b96a94f129556656b1543dd8;hpb=7de3df349f56e05723b3eeb7972aaea4d9fc1000

diff --git a/infra/dgit-mirror-rsync b/infra/dgit-mirror-rsync
index e73d9a5b..2d912c8a 100755
--- a/infra/dgit-mirror-rsync
+++ b/infra/dgit-mirror-rsync
@@ -26,11 +26,24 @@ set -o pipefail
 shopt -s nullglob
 
 case "$DGIT_DRS_DEBUG" in
-''|0!1)		;;
+''|0|1)		;;
 *)		set -x	;;
 esac
 
+fail () {
+	echo >&2 "dgit-mirror-rsync: $*"; exit 127
+}
+
+if [ $# -lt 2 ]; then fail "too few arguments"; fi
+
 self=$0
+
+case "$self" in
+/*)				;;
+*/*)	self="$PWD/$self"	;;
+*)				;;
+esac
+
 distrodir=$1;	shift
 action=$1;	shift
 package=$1
@@ -41,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
 
@@ -54,10 +68,6 @@ rsyncssh='ssh -o batchmode=yes'
 cd $repos
 queue=_mirror-queue
 
-fail () {
-	echo >&2 "dgit-mirror-rsync: $*"; exit 127
-}
-
 case "$remoterepos" in
 *:/*|/*)	;;
 '')		fail "remoterepos config not set" ;;
@@ -65,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"					\
@@ -77,12 +93,12 @@ reinvoke () {
 
 	exec							\
 	"$@"							\
-	"$0"	"$distrodir" "reinvoke$newaction" "$package"
+	"$self"	"$distrodir" "reinvoke$newaction" "$package"
 }
 
 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	;;
@@ -96,13 +112,17 @@ lock-and-process () {
 }
 
 attempt () {
-	exec >"$queue/$package.err" 2>&1
+	exec 3>&2 >"$queue/$package.err" 2>&1
 	if actually; then
-		rm "$queue/$package.a"
+		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 >&2 "$queue/$package.err"
+		cat >&3 "$queue/$package.err"
 		exit 127
 	fi
 }
@@ -137,13 +157,13 @@ reinvoke-locked)
 
 backlog)
 	for f in $queue/*.[na]; do
-		lock-and-process-baseof-f
+		(lock-and-process-baseof-f ||:)
 	done
 	;;
 
 all)
 	for f in [a-z0-9]*.git; do
-		lock-and-process-baseof-f
+		(lock-and-process-baseof-f)
 	done
 	;;