X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.daily;h=1062a49a4305feff539806a36ea3a38c0322daa4;hb=8070bc45cbc18b1f930c1feaebc2344076da0099;hp=dbc34b6af664e7f8cdb056ba22582ef3ceaea958;hpb=bec35cdf1e8d4b78f0cd539660b6a469100b12d2;p=dak.git

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
old mode 100644
new mode 100755
index dbc34b6a..1062a49a
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -11,7 +11,7 @@ export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 # Fix overrides
 
 # disabled by ajt 2008-01-01: requires auth
-#rsync -ql ftp-master::indices/override\* $overridedir
+rsync --password-file /srv/non-us.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/override\* $overridedir
 
 cd $overridedir
 find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip -f
@@ -19,44 +19,37 @@ find . -type l -maxdepth 1 -mindepth 1 | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-	oldstable) override_suite=sarge;;
-	stable) override_suite=etch;;
-	testing) override_suite=lenny;;
-	*) echo "Unknown suite type ($suite)"; exit 1;;
+		oldstable) override_suite=sarge;;
+		stable) override_suite=etch;;
+		testing) override_suite=lenny;;
+		*) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
-	for override_type in $override_types; do
-	    case $override_type in
-	       deb) type="" ;;
-	       dsc) type=".src" ;;
-	       udeb) type=".debian-installer" ;;
-	    esac
-	    # XXX RUN AFUCKINGAWAY
-	    if [ "$override_type" = "udeb" ]; then
-               if [ ! "$component" = "main" ]; then
-	         continue
-	       fi
-	       if [ "$suite" = "unstable" ]; then
-	         dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
-	       fi
-	    else
-	       # XXX removed 2007-08-16 ajt
-	       #dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
-	       true
-	    fi
-	    case $suite in
-	      oldstable)
-		dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-		;;
-	      stable)
-		dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-		;;
-	      testing)
-		dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
-		;;
-	      *) echo "Unknown suite type ($suite)"; exit 1;;
-	    esac
-	done
+		for override_type in $override_types; do
+			case $override_type in
+				deb) type="" ;;
+				dsc) type=".src" ;;
+				udeb) type=".debian-installer" ;;
+			esac
+
+			if [ "$override_type" = "udeb" ]; then
+				if [ ! "$component" = "main" ]; then
+					continue
+				fi
+			fi
+			case $suite in
+				oldstable)
+					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+					;;
+				stable)
+					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+					;;
+				testing)
+					dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+					;;
+				*) echo "Unknown suite type ($suite)"; exit 1;;
+			esac
+		done
     done
 done
 
@@ -65,20 +58,19 @@ for dist in sarge etch lenny; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer ]; then
-	components="$components main.debian-installer"
+		components="$components main.debian-installer"
     fi
     for component in $components; do
-	cat override.$dist.$component >> override.$dist.all3
+		cat override.$dist.$component >> override.$dist.all3
         if [ -e "override.$dist.$component.src" ]; then
-	    cat override.$dist.$component.src >> override.$dist.all3.src
-	fi
+			cat override.$dist.$component.src >> override.$dist.all3.src
+		fi
     done
 done
 
 ################################################################################
 
 # Freshen Packages-Arch-Specific
-
 wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
 
 ################################################################################