Merge branch 'master' into bpo

[dak.git] / scripts / debian / update-mirrorlists

diff --git a/scripts/debian/update-mirrorlists b/scripts/debian/update-mirrorlists
index b68a870cd6714a6cf6d55ad2de91711d49084757..ebd0058835c12cfccb8f7caee0fa5715689fa1dd 100755 (executable)
--- a/scripts/debian/update-mirrorlists
+++ b/scripts/debian/update-mirrorlists
@@ -9,9 +9,9 @@ prog=$scriptdir/mirrorlist/mirror_list.pl
 masterlist=$scriptdir/mirrorlist/Mirrors.masterlist
 
 test ! -f $HOME/.cvspass && \
-       echo ":pserver:anonymous@cvs.debian.org:/cvs/webwml A" > $HOME/.cvspass
-grep -q "cvs.debian.org:/cvs/webwml" ~/.cvspass || \
-       echo ":pserver:anonymous@cvs.debian.org:/cvs/webwml A" >> $HOME/.cvspass
+       echo ":pserver:anonymous@cvs.alioth.debian.org:/cvsroot/webwml A" > $HOME/.cvspass
+grep -q "cvs.alioth.debian.org:/cvs/webwml" ~/.cvspass || \
+       echo ":pserver:anonymous@cvs.alioth.debian.org:/cvsroot/webwml A" >> $HOME/.cvspass
 
 cd $(dirname $masterlist)
 cvs update
@@ -20,10 +20,5 @@ if [ ! -f $ftpdir/README.mirrors.html -o $masterlist -nt $ftpdir/README.mirrors.
        rm -f $ftpdir/README.mirrors.html $ftpdir/README.mirrors.txt
        $prog -m $masterlist -t html > $ftpdir/README.mirrors.html
        $prog -m $masterlist -t text > $ftpdir/README.mirrors.txt
-       if [ ! -f $ftpdir/README.non-US -o $masterlist -nt $ftpdir/README.non-US ] ; then
-               rm -f $ftpdir/README.non-US
-               $prog -m $masterlist -t nonus > $ftpdir/README.non-US
-               install -m 664 $ftpdir/README.non-US $webdir
-       fi
        echo Updated archive version of mirrors file
 fi