Merge branch 'master' into archive-master

[deb/packages.git] / cron.d / 100syncarchive

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index fd46a9934e3dceee22c70ae6d020ae74fb97a3f1..f2458ba67302f18b8183fa23466fd78f3a7255f8 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,33 +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
            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,14 +52,14 @@ 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
            for part in ${parts}
            do
                echo retrieve Packages $dist/$part/$arch
@@ -77,57 +80,7 @@ else
             rsync -t ${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)
-    done
-done
 
-# security archive
-#
-for dist in oldstable stable testing
-do
-    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