cleanup patch from tbm

[dak.git] / cron.daily-security

diff --git a/cron.daily-security b/cron.daily-security
index 131f22b43d620db07e6959241509aeabea804c00..25bba1da88885279af584d1825b2023f526a68c2 100644 (file)
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -8,6 +8,8 @@ export SCRIPTVARS=/org/security.debian.org/katie/vars-security
 
 ################################################################################
 
+# Fix overrides
+
 rsync -ql ftp-master::indices/override\* $overridedir
 
 cd $overridedir
@@ -29,6 +31,11 @@ cd ..
 rm -fr non-US
 
 for suite in $suites; do
+    case $suite in
+       stable) override_suite=potato;;
+       testing) override_suite=woody;;
+       *) echo "Unknown suite type"; exit 1;;
+    esac
     for component in $components; do
        for override_type in $override_types; do
            case $override_type in
@@ -37,12 +44,30 @@ for suite in $suites; do
               udeb) type="skip" ;;
            esac
            if [ ! "$type" = "skip" ]; then
-               $masterdir/natalie -q -S -t $override_type -s $suite -c $component < override.$suite.$component$type
+               $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
            fi
        done
     done
 done
 
+# Generate .all3 overides for the buildd support
+for dist in potato woody; do
+    rm -f override.$dist.all3
+    components="main contrib non-free";
+    if [ -f override.$dist.main.debian-installer ]; then
+       components="$components main.debian-installer";
+    fi
+    for component in $components; do
+       cat override.$dist.$component >> override.$dist.all3;
+    done;
+done
+
+################################################################################
+
+# Freshen Packages-Arch-Specific
+
+wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
+
 ################################################################################
 
 cd $masterdir