only nag once a day

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/backports/common b/config/backports/common
index be0bd4ccb6b69651110273604f393ee1b1f97949..2c7b76ba366b320a074dab046bc963480ae5b7a6 100644 (file)
--- a/config/backports/common
+++ b/config/backports/common
@@ -90,3 +90,14 @@ function sync_debbugs () {
         log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
     fi
 }
+
+function reports() {
+    # Send a report on NEW/BYHAND packages
+    log "Nagging ftpteam about NEW/BYHAND packages"
+    dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" team@backports.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
+    cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" team@backports.debian.org
+}

diff --git a/config/backports/cron.daily b/config/backports/cron.daily
index 1b9a059f22a54cb613170b53a7c6bcbc43c0e15f..59296ec9bc7866c7e26197555ee030f0e96a955a 100755 (executable)
--- a/config/backports/cron.daily
+++ b/config/backports/cron.daily
@@ -19,7 +19,4 @@ dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@backport
 dak cruft-report > $webdir/cruft-report-daily.txt
 cat $webdir/cruft-report-daily.txt | mail -e -s "Debian backports archive cruft report for $(date +%D)" ftpmaster@backports.debian.org
 
-cd $configdir
-apt-ftparchive -q clean apt.conf
-
 echo Daily cron scripts successful.

diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall
index ab171f43504a95ad9ec4ca5accb6bbb18c3aa77e..c5c123adfb61655139a600275a726f9b3e0c9fef 100755 (executable)
--- a/config/backports/cron.dinstall
+++ b/config/backports/cron.dinstall
@@ -363,14 +363,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 # GO=(
 #     FUNC="dm"
 #     TIME=""

diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index 1325b453d2e1f323a1efed46b6446b7fa8ae60b0..6e436f8bcf65a2faf944278a5702452357c34469 100644 (file)
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -446,17 +446,6 @@ function transitionsclean() {
     dak transitions -c -a
 }
 
-function reports() {
-    # Send a report on NEW/BYHAND packages
-    log "Nagging ftpteam about NEW/BYHAND packages"
-    dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" team@backports.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
-    cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" team@backports.debian.org
-}
-
 function dm() {
     log "Updating DM html page"
     $scriptsdir/dm-monitor >$webdir/dm-uploaders.html

diff --git a/config/debian/common b/config/debian/common
index a18433dac49da93f113072ac84bfb426e8a18eed..e29106d300e3480e880b06649f53f85163e24f7c 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -89,3 +89,14 @@ function sync_debbugs () {
         log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
     fi
 }
+
+function reports() {
+    # Send a report on NEW/BYHAND packages
+    log "Nagging ftpteam about NEW/BYHAND packages"
+    dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" 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
+    cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
+}

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 4324a8fe290ad9cebb354895ebce532fa98b19bb..e4f2571841a8faa5e9667bab6068ccb5fdfe9a9a 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -7,6 +7,9 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+# common functions are "outsourced"
+. "${configdir}/common"
+
 ################################################################################
 
 TMPFILE=$( mktemp -p ${TMPDIR} )
@@ -23,4 +26,6 @@ wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
 chmod go+r ${TMPFILE}
 mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
+reports
+
 ################################################################################

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index a9e9bd180be29c0a54af9c8b3ad7c291cf387dea..2b219cdaa113ad9fd0501bd37d65db7946783d8f 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -420,14 +420,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 GO=(
     FUNC="dm"
     TIME=""

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 5805cc948179062c77afed695a1ace69f2becabc..110e4dd0fc2d9d123a00c67a38e3d7f69f56eead 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -446,17 +446,6 @@ function transitionsclean() {
     dak transitions -c -a
 }
 
-function reports() {
-    # Send a report on NEW/BYHAND packages
-    log "Nagging ftpteam about NEW/BYHAND packages"
-    dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" 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
-    cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
-}
-
 function dm() {
     log "Updating DM html page"
     $scriptsdir/dm-monitor >$webdir/dm-uploaders.html