[dak/master] Generate backports-new.html

[Ansgar Burchardt <ansgar@debian.org>]

---
 config/debian/cron.hourly |    1 +
 config/debian/dak.conf    |    1 +
 dak/show_new.py           |    6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index e9696d4..c82754f 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -33,6 +33,7 @@ if lockfile -r16 $LOCKFILE 2> /dev/null; then
 fi
 
 dak queue-report -n > $webdir/new.html
+dak queue-report -n -d backports-new > ${webdir}/backports-new.html
 dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
 sudo -u dak-unpriv dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
 dak graph -n new,byhand,stable-new,oldstable-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 41032c6..8208458 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -48,6 +48,7 @@ Generate-Index-Diffs
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
+  Options::Queue "new,backports-new";
 }
 
 Show-Deferred
diff --git a/dak/show_new.py b/dak/show_new.py
index 2ec2c35..1397a32 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -223,7 +223,8 @@ def init(session):
     cnf = Config()
 
     Arguments = [('h',"help","Show-New::Options::Help"),
-                 ("p","html-path","Show-New::HTMLPath","HasArg")]
+                 ("p","html-path","Show-New::HTMLPath","HasArg"),
+                 ('q','queue','Show-New::Options::Queue','HasArg')]
 
     for i in ["help"]:
         if not cnf.has_key("Show-New::Options::%s" % (i)):
@@ -235,8 +236,9 @@ def init(session):
     if Options["help"]:
         usage()
 
+    queue_names = Options.find('Queue', 'new').split(',')
     uploads = session.query(PolicyQueueUpload) \
-        .join(PolicyQueueUpload.policy_queue).filter(PolicyQueue.queue_name == 'new') \
+        .join(PolicyQueueUpload.policy_queue).filter(PolicyQueue.queue_name.in_(queue_names)) \
         .join(PolicyQueueUpload.changes).order_by(DBChange.source)
 
     if len(changesnames) > 0:
-- 
1.7.2.5