From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 8 Dec 2012 22:37:43 +0000 (+0100)
Subject: wheezy rsync as a client behaves differently
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=59b7870d664545dcb4a065d17da669805ecc9458;p=mirror%2Fdsa-puppet.git

wheezy rsync as a client behaves differently
---

diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap
index 06ab715f4..6041a567b 100755
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -74,11 +74,11 @@ do_rsync() {
 	local remote_host="$1"; shift
 
 	local args="--server --sender -vltrze.iLsf --safe-links ."
-	if [ "$*" = "$args -new-/" ] ; then
+	if [ "$*" = "$args -new-/" ] || [ "$*" = "$args ./-new-/" ] ; then
 		local path="$BASEDIR/current-push"
 		info "serving $remote_host with $path"
 		rsync $args "$path/."
-	elif [ "$*" = "$args . -live-/" ] ; then
+	elif [ "$*" = "$args . -live-/" ] || [ "$*" = "$args . ./-live-/" ] ; then
 		local path="$BASEDIR/current-live"
 		info "host $remote_host wants $path, acquiring lock"
 		lock 200 "$path" 0