[dak/master] Run policy from unchecked as well as dinstall
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/debian/common | 20 ++++++++++++++++++++
config/debian/cron.unchecked | 8 ++++++++
config/debian/dinstall.functions | 17 -----------------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/config/debian/common b/config/debian/common
index 6155951..84640e2 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -47,6 +47,26 @@ function make_buildd_dir () {
}
+# Process (oldstable)-proposed-updates "NEW" queue
+function punew_do() {
+ date -u -R >> REPORT
+ dak process-policy $1 | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in $1" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f
+ echo >> REPORT
+}
+
+# These versions used in dinstall
+function punew() {
+ log "Doing automated p-u-new processing"
+ cd "${queuedir}/p-u-new"
+ punew_do "$1"
+}
+
+function opunew() {
+ log "Doing automated o-p-u-new processing"
+ cd "${queuedir}/o-p-u-new"
+ punew_do "$1"
+}
+
# Do the unchecked processing, in case we have files.
function do_unchecked () {
cd $unchecked
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index d3e07e1..a534ba0 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -97,7 +97,15 @@ trap cleanup 0
pg_timestamp preunchecked >/dev/null
+
+# Process policy queues
+punew proposedupdates
+opunew oldproposedupdates
+
+# Now process the NEW staging area
do_newstage
+
+# Finally deal with unchecked
do_unchecked
if [ ! -z "$changes" ]; then
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 2981c8c..b9f834b 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -53,23 +53,6 @@ function updates() {
$scriptsdir/update-pseudopackages.sh
}
-# Process (oldstable)-proposed-updates "NEW" queue
-function punew_do() {
- date -u -R >> REPORT
- dak process-policy $1 | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in $1" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
- echo >> REPORT
-}
-function punew() {
- log "Doing automated p-u-new processing"
- cd "${queuedir}/p-u-new"
- punew_do "$1"
-}
-function opunew() {
- log "Doing automated o-p-u-new processing"
- cd "${queuedir}/o-p-u-new"
- punew_do "$1"
-}
-
# The first i18n one, syncing new descriptions
function i18n1() {
log "Synchronizing i18n package descriptions"
--
1.7.2.5
Reply to: