[dak/master] better handling of that report file
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/common | 4 ++--
config/debian/cron.unchecked | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/config/debian/common b/config/debian/common
index 090f2ab..f76fb95 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -72,13 +72,13 @@ function do_unchecked () {
report=$queuedir/REPORT
timestamp=$(date "+%Y-%m-%d %H:%M")
- echo "$timestamp": "$changes" >> $report
+ echo "$timestamp": ${changes:-"Nothing to do"} >> $report
dak process-unchecked -a -d "$unchecked" >> $report
- echo "--" >> $report
}
function sync_debbugs () {
# sync with debbugs
+ echo "--" >> $report
rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
NOW=$(date +%s)
TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 77b7d88..cf9cd6e 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -82,6 +82,4 @@ do_unchecked
if [ ! -z "$changes" ]; then
sync_debbugs
do_buildd
-else
- echo "$timestamp": Nothing to do >> $report
fi
--
1.5.6.5
Reply to: