X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cron.d%2F100syncarchive;h=7de876082f7487157b8906a357407c56704036ee;hb=2b7709d2271f339165fb401ef02085d23af5db18;hp=fd46a9934e3dceee22c70ae6d020ae74fb97a3f1;hpb=1f7a7225c79c1a6a1caa2f51d208e1dad14997d7;p=deb%2Fpackages.git

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index fd46a99..7de8760 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,33 +15,33 @@ 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
 	    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
@@ -49,69 +49,48 @@ 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 -Lt ${localdir}/dists/${dist}/Release us/${dist}/Release
+	rsync -Lt ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
 
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || 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}
-		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
+		rsync -Lt ${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
+	    #FIXME: the symlinks for wheezy/sid/experimental will go away
+	    #FIXME: this only pulls in the contents files for main in wheezy/sid/experimental
 	    echo retrieve Contents $dist/$arch
-	    rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
+	    rsync -Lt ${localdir}/dists/${dist}/Contents-${arch}.gz \
 		us/${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
-            rsync -t ${localdir}/dists/${dist}/${part}/source/Sources.gz \
+            rsync -Lt ${localdir}/dists/${dist}/${part}/source/Sources.gz \
 	    	us/${dist}/${part}/source/Sources.gz
 	done
-    done
-fi
 
-# Non-US archive
-#
-for dist in oldstable
-do
-    foo=\$arch_${dist//-/_}
-    for arch in `eval echo $foo`
-    do
-	for part in ${parts}
-	do
-	    echo retrieve Packages $dist/$part/non-US/$arch
-	    test -d non-US/${dist}/${part}/binary-${arch} || mkdir -p non-US/${dist}/${part}/binary-${arch}
-	    (cd non-US/${dist}/${part}/binary-${arch} &&
-		wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/binary-${arch}/Packages.gz)
-	done
-	#FIXME: no Contents files for p-u
-	echo retrieve Contents $dist/non-US/$arch
-	(cd non-US/${dist} &&
-	    wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/Contents-${arch}.gz)
-    done
-    for part in ${parts}
-    do
-        echo retrieve Sources $dist/$part/non-US
-    	test -d non-US/${dist}/${part}/source || mkdir -p non-US/${dist}/${part}/source
-	(cd non-US/${dist}/${part}/source &&
-	    wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/source/Sources.gz)
+	$check_release_cmd $archivedir/us/${dist}/Release
     done
-done
+fi
 
 # security archive
 #
-for dist in oldstable stable testing
+for dist in lenny squeeze
 do
+    echo "retrieve Release(.gpg) $dist"
+    test -d security/${dist} || mkdir -p security/${dist}
+    (cd security/${dist} &&
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release &&
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+        
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
     do
@@ -120,7 +99,7 @@ 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)
+	    $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
@@ -128,6 +107,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}/updates/${part}/source/Sources.gz)
     done
+
+    $check_release_cmd $archivedir/security/${dist}/Release
 done