X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cron.d%2F100syncarchive;h=f2458ba67302f18b8183fa23466fd78f3a7255f8;hb=1d7caad10f40cd0a997c026b47c699b69f7c75d5;hp=5cb5af4e2769af6a5ef098560b5a0886b72f8fc6;hpb=648a333fa9bee495e2a16843f3b5c61957828f11;p=deb%2Fpackages.git

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 5cb5af4..f2458ba 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,35 +15,36 @@ 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
@@ -59,7 +60,6 @@ else
 	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
@@ -80,35 +80,7 @@ else
             rsync -t ${localdir}/dists/${dist}/${part}/source/Sources.gz \
 	    	us/${dist}/${part}/source/Sources.gz
 	done
-    done
-fi
 
-# security archive
-#
-for dist in sarge etch lenny
-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 )
-        
-    foo=\$arch_${dist//-/_}
-    for arch in `eval echo $foo`
-    do
-      for part in ${parts}
-      do
-	echo retrieve Packages $dist/$part/security/$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)
-      done
-    done
-    for part in ${parts}
-    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)
+	$check_release_cmd $archivedir/us/${dist}/Release
     done
-done
+fi