From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 27 May 2012 08:39:18 +0000 (+1000)
Subject: fetch_trees: don;t use rsync for quilt series any more
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=3861b20e25c763322862912b835cc28aec958665;p=next-scripts

fetch_trees: don;t use rsync for quilt series any more
---

diff --git a/fetch_trees b/fetch_trees
index f7e2312..a69e96c 100755
--- a/fetch_trees
+++ b/fetch_trees
@@ -21,20 +21,8 @@ for name in $trees; do
 
 	if [ "$type" = "quilt" ]; then
 		url=$(get_field "$name" 4)
+		url=${url%/}	# strip trailing / if necessary
 
-		case "$url" in
-#		http://kernel.org/*|http://www.kernel.org/*)
-#			use_rsync=true
-#			rurl=$(echo "$url" | sed -r 's,^http://(www\.)?kernel\.org,master.kernel.org:,')
-#			;;
-		http://ozlabs.org/~*)
-			use_rsync=true
-			rurl=$(echo "$url" | sed -r 's,^http://ozlabs\.org/([^/]*),ozlabs.org:\1/public_html,')
-			;;
-		*)
-			use_rsync=false
-			;;
-		esac
 		cd ../quilt || {
 			echo "Cannot chdir to ../quilt" 1>&2
 			continue
@@ -49,25 +37,14 @@ for name in $trees; do
 			cd "$origwd"
 			continue
 		}
-		if $use_rsync; then
-			rsync -avz "$rurl/series" series || {
-				echo "rsync of $name series file failed" 1>&2
-				cd ..
-				rm -rf "$name"
-				git checkout "$name"
-				cd "$origwd"
-				continue
-			}
-		else
-			wget -N -nv --no-cache "$url/series" || {
-				echo "Wget of $name series file failed" 1>&2
-				cd ..
-				rm -rf "$name"
-				git checkout "$name"
-				cd "$origwd"
-				continue
-			}
-		fi
+		wget -N -nv --no-cache "$url/series" || {
+			echo "Wget of $name series file failed" 1>&2
+			cd ..
+			rm -rf "$name"
+			git checkout "$name"
+			cd "$origwd"
+			continue
+		}
 		find * -type f | grep -v '^series$' | sort >.series.old
 		do_echo=echo
 		grep -q NEXT_PATCHES series &&
@@ -82,25 +59,15 @@ for name in $trees; do
 		done <series |
 			sed -e 's/[ 	]*#.*$//' -e '/^[ 	]*$/d' |
 			sort >.series.next
-		if $use_rsync; then
-			rsync -avz --files-from .series.next "$rurl" . || {
-				echo "rsync of series '$name' failed" 1>&2
-				cd ..
-				rm -rf "$name"
-				git checkout "$name"
-				cd "$origwd"
-				continue
-			}
-		else
-			wget -N -nv --no-cache -B "$url" -i .series.next || {
-				echo "Wget of series '$name' failed" 1>&2
-				cd ..
-				rm -rf "$name"
-				git checkout "$name"
-				cd "$origwd"
-				continue
-			}
-		fi
+		sed "s|^|$url/|" .series.next |
+				wget -N -nv --no-cache -i - || {
+			echo "Wget of series '$name' failed" 1>&2
+			cd ..
+			rm -rf "$name"
+			git checkout "$name"
+			cd "$origwd"
+			continue
+		}
 		comm -23 .series.old .series.next | xargs -r rm -f
 		rm -f .series.old .series.next
 		cd "$origwd"
@@ -108,7 +75,7 @@ for name in $trees; do
 done
 
 cd ../quilt
-git add .
+git add -A .
 git commit -v -a -m "$(date '+%F-%H:%M')" -e
 
 exit 0