Merge branch 'master' into debian-master

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

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index a6b0e83429e311517cdc601ef62531842dabd198..7de876082f7487157b8906a357407c56704036ee 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,9 +21,6 @@ then
        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
@@ -32,7 +29,6 @@ then
                    $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_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
@@ -44,6 +40,8 @@ then
             (cd us/${dist}/${part}/source &&
                 $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,41 +49,41 @@ else
     do
         echo "retrieve Releases(.gpg) $dist"
        test -d us/${dist} || mkdir -p us/${dist}
-       rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release
-       rsync -t ${localdir}/dists/${dist}/Release.gpg us/${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
-           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}
-               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
+
+       $check_release_cmd $archivedir/us/${dist}/Release
     done
 fi
 
 # security archive
 #
-for dist in sarge etch lenny
+for dist in lenny squeeze
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
@@ -111,4 +109,6 @@ do
         (cd security/${dist}/${part}/source &&
             $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
     done
+
+    $check_release_cmd $archivedir/security/${dist}/Release
 done