X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=4d7ad846fc7d03c9b90b46e3844555cfa786a44f;hb=01bea71d37e475eb08b1bc4e3e4fcd1cf62b078a;hp=84640e2a6e7eddac3d33e825f40939e9f3bb04a0;hpb=2c070e8e93167b48816a0af8e59e79f82cf293cd;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 84640e2a..4d7ad846 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -50,19 +50,23 @@ 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 
+    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
 }
 
 # These versions used in dinstall
 function punew() {
-    log "Doing automated p-u-new processing"
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated p-u-new processing"
+    fi
     cd "${queuedir}/p-u-new"
     punew_do "$1"
 }
 
 function opunew() {
-    log "Doing automated o-p-u-new processing"
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated o-p-u-new processing"
+    fi
     cd "${queuedir}/o-p-u-new"
     punew_do "$1"
 }
@@ -122,8 +126,8 @@ function reports() {
     dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
     # and one on crufty packages
     log "Sending information about crufty packages"
-    dak cruft-report > $webdir/cruft-report-daily.txt
-    dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
+    dak cruft-report -R > $webdir/cruft-report-daily.txt
+    dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt
     cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 }