X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;f=my-debmirror;h=fd11f52e10c348fce5d27b00840edc684ad396ca;hb=c2b0dc4acf4422ca859622359ca6b2bdacfbbe92;hp=6fa7952d74d5c7f55bb0c6e015d04620cc76af3e;hpb=2778c7564134e0d419d8b7ee35d8a67a0c955cf1;p=bin.git

diff --git a/my-debmirror b/my-debmirror
index 6fa7952..fd11f52 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,20 +1,23 @@
 #! /bin/sh
+set -e
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
-debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=testing,unstable \
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=lenny,squeeze,sid \
 	  --section=main,contrib,non-free,main/debian-installer \
-	  --arch=i386,powerpc --getcontents \
-	  --ignore=non-US/,doc/,indices/,tools/,main/installer- "$@"
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --dist=testing/non-US,unstable/non-US \
-	  --arch=i386,powerpc --getcontents "$@"
+	  --arch=i386 --getcontents \
+	  --ignore=^README --ignore=^doc/ \
+	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
+ln -nsf lenny /mirror/debian/dists/stable
+ln -nsf squeeze /mirror/debian/dists/testing
+ln -nsf sid /mirror/debian/dists/unstable
 rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
 for dir in doc indices tools; do
-	rsync -aqz "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+	rsync -aqz --delete "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
 done
-for dist in testing unstable; do
-	for arch in i386 powerpc; do
-		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+for dist in lenny squeeze sid; do
+	for arch in i386; do
+		rsync -aqz --delete \
+			"$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
 			"/mirror/debian/dists/$dist/main/installer-$arch/"
 	done
 done