From d11d0610cc3a8e8cfc4d987d8e5d6901195f5f4e Mon Sep 17 00:00:00 2001
From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 7 Oct 2010 21:33:18 +0200
Subject: [PATCH] only nag once a day
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/backports/common | 11 +++++++++++
config/backports/cron.daily | 3 ---
config/backports/cron.dinstall | 8 --------
config/backports/dinstall.functions | 11 -----------
config/debian/common | 11 +++++++++++
config/debian/cron.daily | 5 +++++
config/debian/cron.dinstall | 8 --------
config/debian/dinstall.functions | 11 -----------
8 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/config/backports/common b/config/backports/common
index be0bd4cc..2c7b76ba 100644
--- 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 1b9a059f..59296ec9 100755
--- 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 ab171f43..c5c123ad 100755
--- 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 1325b453..6e436f8b 100644
--- 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 a18433da..e29106d3 100644
--- 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 4324a8fe..e4f25718 100755
--- 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 a9e9bd18..2b219cda 100755
--- 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 5805cc94..110e4dd0 100644
--- 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
--
2.39.5