X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cron.d%2F100syncarchive;h=3f2008a24cfde58564f4ad8bb42e4b1c50a2ca84;hb=90b972730bae671e726706892b471e0ce0ac097a;hp=928fefc07b5bc653bdabcfa4ada5207439df0b28;hpb=442f1a531440d0c79c8cfe0d29b32b3f17896930;p=deb%2Fpackages.git

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 928fefc..3f2008a 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,35 +15,32 @@ then
         echo "retrieve Release(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
 	(cd us/${dist} &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release.gpg )
+	    $wget_cmd -N ${ftpsite}/dists/${dist}/Release &&
+	    $wget_cmd -N ${ftpsite}/dists/${dist}/Release.gpg )
         
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
-	    test ! "$arch" = "armel" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
 		(cd us/${dist}/${part}/binary-${arch} &&
-		    wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+		    $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
 	    done
-	    #FIXME: no Contents files for p-u
-	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    (cd us/${dist} &&
-		wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
+		$wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
 	done
 	for part in ${parts}
 	do
 	    echo retrieve Sources $dist/$part
 	    test -d us/${dist}/${part}/source || mkdir -p us/${dist}/${part}/source
             (cd us/${dist}/${part}/source &&
-                wget -q -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
+                $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
 	done
+
+	$check_release_cmd $archivedir/us/${dist}/Release
     done
 else
     echo using local mirror
@@ -51,16 +48,12 @@ else
     do
         echo "retrieve Releases(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
-	(cd us/${dist} &&
-	    rsync -t ${localdir}/dists/${dist}/Release &&
-	    rsync -t ${localdir}/dists/${dist}/Release.gpg )
+	rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release
+	rsync -t ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
 
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
-	    test ! "$arch" = "armel" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -68,8 +61,6 @@ else
 		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
 		    us/${dist}/${part}/binary-${arch}/Packages.gz
 	    done
-	    #FIXME: no Contents files for p-u
-	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
 		us/${dist}/Contents-${arch}.gz
@@ -81,28 +72,30 @@ else
             rsync -t ${localdir}/dists/${dist}/${part}/source/Sources.gz \
 	    	us/${dist}/${part}/source/Sources.gz
 	done
+
+	$check_release_cmd $archivedir/us/${dist}/Release
     done
 fi
 
 # security archive
 #
-for dist in oldstable stable testing
+for dist in $dists
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
     (cd security/${dist} &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release &&
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release.gpg )
         
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
     do
       for part in ${parts}
       do
-	echo retrieve Packages $dist/$part/security/$arch
+	echo retrieve Packages $dist-security/$part/$arch
 	test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch}
 	(cd  security/${dist}/${part}/binary-${arch} &&
-	    wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
+	    $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
@@ -110,6 +103,8 @@ do
         echo retrieve Sources $dist/$part/security
         test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source
         (cd security/${dist}/${part}/source &&
-            wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
+            $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz)
     done
+
+    $check_release_cmd $archivedir/security/${dist}/Release
 done