rrd foo

only one rrd-release-freeze-dates file
proper file headers

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

diff --git a/config/backports/cron.hourly b/config/backports/cron.hourly
index 5357653e9fd7b4968a3b5d39c42672d75014c70d..12e06fc0723e8133ad6c0ffe8fcc4732be6cfbc5 100755 (executable)
--- 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 3446182e794d28a89d30853f2635aee20c803322..d24cb18295871452f7d17cabdc0ec4407ac4b7d8 100755 (executable)
--- 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 (file)
index ef70834..0000000
--- 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 06deaef1d638e5f962b0c6dd20d759cfe1ac6d5a..9afc02e02e590b8135d6668df38eda4628ca7a41 100755 (executable)
--- 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 <pabs@debian.org>
+""" Produces a set of graphs of NEW/BYHAND/DEFERRED
+
+@contact: Debian FTPMaster <ftpmaster@debian.org>
+@copyright: 2011 Paul Wise <pabs@debian.org>
+"""
 
 # 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 ef70834e2f91e0fa33ba7aa3afa3bf1e55c427a6..7981e51ac89507f239a0de5cc0467122cadcca32 100644 (file)
--- 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