* vars: external-overrides variable added* cron.daily: Update testing/unstable Task...

diff --git a/cron.daily b/cron.daily
index 0d2d7fc4e2524398a6552c9b8e37b62371b32542..f868b74041faf93ce31883bbde694ef718133778 100755 (executable)
--- a/cron.daily
+++ b/cron.daily
@@ -55,6 +55,11 @@ jenna
 # Generate override files
 cd $overridedir
 denise
+
+# Update task overrides for testing and unstable
+cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sarge.extra.main
+cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sid.extra.main
+
 # FIXME
 rm -f override.potato.all3 override.sid.all3
 for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done

diff --git a/vars b/vars
index 4aa36ddfb3e502a2823986ca5dd64f07a2a0af1b..d921984f5beb054ac993ff912532e36571ad67cf 100644 (file)
--- a/vars
+++ b/vars
@@ -10,6 +10,7 @@ scriptdir=$base/scripts
 masterdir=$base/katie/
 dbdir=$base/database/
 overridedir=$scriptdir/override
+extoverridedir=$scriptdir/external-overrides
 
 queuedir=$base/queue/
 unchecked=$queuedir/unchecked/