From ea17c4aee282ecf1551870e5eccc14cfd21b9d2f Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sat, 19 Feb 2011 22:00:01 +0100 Subject: [PATCH] rrd foo only one rrd-release-freeze-dates file proper file headers Signed-off-by: Joerg Jaspert --- config/backports/cron.hourly | 3 +-- config/debian/cron.hourly | 2 +- config/debian/rrd-release-freeze-dates | 2 -- dak/graph.py | 9 ++++++--- .../debian}/rrd-release-freeze-dates | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 config/debian/rrd-release-freeze-dates rename {config/backports => scripts/debian}/rrd-release-freeze-dates (65%) diff --git a/config/backports/cron.hourly b/config/backports/cron.hourly index 5357653e..12e06fc0 100755 --- a/config/backports/cron.hourly +++ b/config/backports/cron.hourly @@ -12,8 +12,7 @@ dak import-users-from-passwd dak queue-report -n > $webdir/new.html dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir #dak show-deferred > ${webdir}/deferred.html -dak graph -n new,byhand,proposedupdates,oldproposedupdates -r $webdir -i $webdir -x $configdir/rrd-release-freeze-dates -#dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir -i $webdir -x $configdir/rrd-release-freeze-dates +dak graph -n new,byhand,proposedupdates,oldproposedupdates -r $webdir -i $webdir -x $scriptsdir/rrd-release-freeze-dates dak show-new > /dev/null # cd $webdir diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly index 3446182e..d24cb182 100755 --- a/config/debian/cron.hourly +++ b/config/debian/cron.hourly @@ -12,7 +12,7 @@ dak import-users-from-passwd dak queue-report -n > $webdir/new.html dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir dak show-deferred > ${webdir}/deferred.html -dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir -i $webdir -x $configdir/rrd-release-freeze-dates +dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir -i $webdir -x $scriptsdir/rrd-release-freeze-dates # do not run show-new and other stuff in parallel LOCKFILE="$lockdir/unchecked.lock" diff --git a/config/debian/rrd-release-freeze-dates b/config/debian/rrd-release-freeze-dates deleted file mode 100644 index ef70834e..00000000 --- a/config/debian/rrd-release-freeze-dates +++ /dev/null @@ -1,2 +0,0 @@ -VRULE:1234691928#632a5b:lenny release -VRULE:1281102258#0b19c1:squeeze freeze diff --git a/dak/graph.py b/dak/graph.py index 06deaef1..9afc02e0 100755 --- a/dak/graph.py +++ b/dak/graph.py @@ -1,7 +1,10 @@ #!/usr/bin/env python -""" Produces a set of graphs of NEW/BYHAND/DEFERRED""" -# Copyright 2011 Paul Wise +""" Produces a set of graphs of NEW/BYHAND/DEFERRED + +@contact: Debian FTPMaster +@copyright: 2011 Paul Wise +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,7 +35,7 @@ default_names = ["byhand", "new", "deferred"] ################################################################################ def usage(exit_code=0): - print """Usage: dak queue-graph + print """Usage: dak graph Graphs the number of packages in queue directories (usually new and byhand). -h, --help show this help and exit. diff --git a/config/backports/rrd-release-freeze-dates b/scripts/debian/rrd-release-freeze-dates similarity index 65% rename from config/backports/rrd-release-freeze-dates rename to scripts/debian/rrd-release-freeze-dates index ef70834e..7981e51a 100644 --- a/config/backports/rrd-release-freeze-dates +++ b/scripts/debian/rrd-release-freeze-dates @@ -1,2 +1,3 @@ VRULE:1234691928#632a5b:lenny release VRULE:1281102258#0b19c1:squeeze freeze +VRULE:1296908977#0b19c1:squeeze release -- 2.39.2