ftpmaster-dak r1072: Rename daily cronscript to dinstall, as its not run daily for a long time now
------------------------------------------------------------
revno: 1072
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sat 2008-05-03 13:35:35 +0200
message:
Rename daily cronscript to dinstall, as its not run daily for a long time now
renamed:
config/debian/cron.daily => config/debian/cron.dinstall
modified:
ChangeLog
config/debian/cron.dinstall
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-03 07:04:31 +0000
+++ b/ChangeLog 2008-05-03 11:35:35 +0000
@@ -1,3 +1,11 @@
+2008-05-03 Joerg Jaspert <joerg@debian.org>
+
+ * config/debian/cron.daily: Rename to
+ * config/debian/cron.dinstall: this, as its not really something run
+ daily for some time now. And while dinstall is an OLD name, its
+ recognized pretty well within Debian
+ Also add some more timing information
+
2008-05-03 Thomas Viehmann <tv@beamnet.de>
* dak/process_unchecked.py (check_hashes): Reject on error while
=== renamed file 'config/debian/cron.daily' => 'config/debian/cron.dinstall'
--- a/config/debian/cron.daily 2008-05-02 20:52:12 +0000
+++ b/config/debian/cron.dinstall 2008-05-03 11:35:35 +0000
@@ -10,7 +10,7 @@
# Start logging
NOW=`date "+%Y.%m.%d-%H:%M:%S"`
-LOGFILE="$logdir/daily_${NOW}.log"
+LOGFILE="$logdir/dinstall_${NOW}.log"
exec > "$LOGFILE" 2>&1
echo Archive maintenance started at $(date +%X)
@@ -109,11 +109,15 @@
# Update fingerprints
dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
# Generate override files
echo "Writing overrides into text files"
cd $overridedir
dak make-overrides
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
# FIXME
rm -f override.sid.all3
for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
@@ -125,8 +129,14 @@
cd $configdir
apt-ftparchive generate apt.conf
# Generate *.diff/ incremental updates
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
echo "Generating pdiff files"
dak generate-index-diffs
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
# Generate Release files
echo "Generating Release files"
dak generate-releases
@@ -158,6 +168,9 @@
./mkchecksums
#
rm -f $NOTICE
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
echo "Trigger daily wanna-build run"
ssh buildd@buildd /org/wanna-build/trigger.daily
@@ -191,6 +204,8 @@
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
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
echo "Updating DM html page"
$scriptsdir/dm-monitor >$webdir/dm-uploaders.html
@@ -238,10 +253,12 @@
done
)
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
echo "Finally, all is done, sending mail and compressing logfile"
exec > /dev/null 2>&1
-cat "$LOGFILE" | mail -s "Log for cron.daily run of $(date +%Y.%m.%d)" cron@ftp-master.debian.org
+cat "$LOGFILE" | mail -s "Log for dinstall run of $(date +%Y.%m.%d' at '%H:%M)" cron@ftp-master.debian.org
bzip2 -9 "$LOGFILE"
################################################################################
Reply to: