X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=my-debmirror;h=a1d70566f1e46576a83c4e5ebeeac55289d0854b;hp=75ad1214522d8cadc346f9bf8944e6d86e63a5c4;hb=e4b9308c43225f8e42900775e42957ae986f4ada;hpb=7c79354606f7d3df35fc82223070758567e42e4e

diff --git a/my-debmirror b/my-debmirror
index 75ad121..a1d7056 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,22 +1,23 @@
 #! /bin/sh
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
 debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=testing,unstable \
+	  --dist=sarge,sid \
 	  --section=main,contrib,non-free,main/debian-installer \
 	  --arch=i386,powerpc --getcontents \
-	  --ignore=non-US/,doc/,indices/,tools/,main/installer- "$@"
+	  --ignore=^README --ignore=^non-US/ --ignore=^doc/ \
+	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
 debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --dist=testing/non-US,unstable/non-US \
+	  --dist=sarge/non-US,sid/non-US \
 	  --arch=i386,powerpc --getcontents "$@"
-ln -sf testing /mirror/debian/dists/sarge
-ln -sf unstable /mirror/debian/dists/sid
-ln -sf testing /mirror/debian/non-US/dists/sarge
-ln -sf unstable /mirror/debian/non-US/dists/sid
+ln -nsf sarge /mirror/debian/dists/testing
+ln -nsf sid /mirror/debian/dists/unstable
+ln -nsf sarge /mirror/debian/non-US/dists/testing
+ln -nsf sid /mirror/debian/non-US/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/"
 done
-for dist in testing unstable; do
+for dist in sarge sid; do
 	for arch in i386 powerpc; do
 		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
 			"/mirror/debian/dists/$dist/main/installer-$arch/"