From b8939a26da804b7d4610654003e554579b85e6d3 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 26 Apr 2008 21:59:03 +0200 Subject: [PATCH] 100syncarchive*: Use check-release to check Release files Failing checks have no consequences yet, but they are at least logged. --- config.sh.sed.in | 3 ++- cron.d/100syncarchive | 6 ++++++ cron.d/100syncarchive_amd64 | 2 ++ cron.d/100syncarchive_backports | 2 ++ cron.d/100syncarchive_debports | 2 ++ cron.d/100syncarchive_installer | 4 ++++ cron.d/100syncarchive_m68k | 3 +++ cron.d/100syncarchive_volatile | 2 ++ 8 files changed, 23 insertions(+), 1 deletion(-) diff --git a/config.sh.sed.in b/config.sh.sed.in index 576ba3f..c208878 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -32,7 +32,8 @@ amd64_ftpsite=http://amd64.debian.net/debian debports_ftpsite=http://ftp.debian-ports.org/debian ddtp_ftpsite=http://ddtp.debian.net/debian -wget_cmd="wget --no-verbose --tries=2 --timeout=60" +wget_cmd="wget --no-verbose --tries=2 --timeout=60" +check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg" root="" diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index 01a2c43..cb6f18c 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -43,6 +43,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 @@ -78,6 +80,8 @@ 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 @@ -109,4 +113,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 diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64 index 535604f..070e6d7 100755 --- a/cron.d/100syncarchive_amd64 +++ b/cron.d/100syncarchive_amd64 @@ -27,5 +27,7 @@ for dist in sarge echo retrieve Contents $dist/$arch (cd amd64/${dist} && $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz) + + $check_release_cmd $archivedir/amd64/${dist}/Release done diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports index 069b1e4..84820cb 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -36,4 +36,6 @@ do (cd backports/${dist}-backports/${part}/source && $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz) done + + $check_release_cmd $archivedir/backports/${dist}-backports/Release done diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports index 6fb224d..ba5986e 100755 --- a/cron.d/100syncarchive_debports +++ b/cron.d/100syncarchive_debports @@ -30,4 +30,6 @@ for dist in sid experimental (cd debports/${dist} && $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz) done + + $check_release_cmd $archivedir/debports/${dist}/Release done diff --git a/cron.d/100syncarchive_installer b/cron.d/100syncarchive_installer index ea95989..90b9145 100755 --- a/cron.d/100syncarchive_installer +++ b/cron.d/100syncarchive_installer @@ -29,6 +29,8 @@ then $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) done done + + $check_release_cmd $archivedir/us/${dist}/Release done else echo using local mirror @@ -51,5 +53,7 @@ else us/${dist}/${part}/binary-${arch}/Packages.gz done done + + $check_release_cmd $archivedir/us/${dist}/Release done fi diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k index f0d0aac..00b01cf 100755 --- a/cron.d/100syncarchive_m68k +++ b/cron.d/100syncarchive_m68k @@ -42,6 +42,8 @@ then (cd us/${dist}-${arch}/${part}/source && $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/${part}/source/Sources.gz) done + + $check_release_cmd $archivedir/us/${dist}-${arch}/Release done else echo using local mirror @@ -76,6 +78,7 @@ else rsync -t ${localdir}/dists/${dist}-${arch}/${part}/source/Sources.gz \ us/${dist}-${arch}/${part}/source/Sources.gz done + $check_release_cmd $archivedir/us/${dist}-${arch}/Release done fi diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile index a01d19f..567ebfb 100755 --- a/cron.d/100syncarchive_volatile +++ b/cron.d/100syncarchive_volatile @@ -37,4 +37,6 @@ do (cd volatile/${dist}-volatile/$part/source && $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz) done + + $check_release_cmd $archivedir/volatile/${dist}-volatile/Release done -- 2.39.2