Run policy from unchecked as well as dinstall

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian/common b/config/debian/common
index 61559515c04620b0b1c45f09ee6ba22a422ca0b3..84640e2a6e7eddac3d33e825f40939e9f3bb04a0 100644 (file)
--- 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 d3e07e158a7b3453a14874d0266200d77190aed0..a534ba06cf2cd159045f1c009c818fe8581fad47 100755 (executable)
--- 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 2981c8c303d513bc223a2ff7d21c68ae00f1c58e..b9f834b33d07c50165ea94028f1832cf3b771866 100644 (file)
--- 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"