Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / show_new.py
diff --git a/dak/show_new.py b/dak/show_new.py

index 2ec2c3518bae47d43c3104eba8f54561be416d7e..af1b8a6480b0b58ea6c1af99a90ea94fffa732b6 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -33,7 +33,6 @@ import examine_package
  from daklib import policy
  from daklib.dbconn import *
  from daklib import utils
-from daklib.regexes import re_source_ext
  from daklib.config import Config
  from daklib import daklog
  from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
@@ -62,7 +61,7 @@ def html_header(name, missing):
      />
      <title>%(name)s - Debian NEW package overview</title>
      <link type="text/css" rel="stylesheet" href="/style.css" />
-    <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
+    <link rel="shortcut icon" href="https://www.debian.org/favicon.ico" />
      <script type="text/javascript">
        //<![CDATA[
        <!--
@@ -89,21 +88,21 @@ def html_header(name, missing):
    </head>
    <body id="NEW-details-page">
      <div id="logo">
-      <a href="http://www.debian.org/">
-        <img src="http://www.debian.org/logos/openlogo-nd-50.png"
+      <a href="https://www.debian.org/">
+        <img src="https://www.debian.org/logos/openlogo-nd-50.png"
          alt="debian logo" /></a>
-      <a href="http://www.debian.org/">
-        <img src="http://www.debian.org/Pics/debian.png"
+      <a href="https://www.debian.org/">
+        <img src="https://www.debian.org/Pics/debian.png"
          alt="Debian Project" /></a>
      </div>
      <div id="titleblock">
-      <img src="http://www.debian.org/Pics/red-upperleft.png"
+      <img src="https://www.debian.org/Pics/red-upperleft.png"
        id="red-upperleft" alt="corner image"/>
-      <img src="http://www.debian.org/Pics/red-lowerleft.png"
+      <img src="https://www.debian.org/Pics/red-lowerleft.png"
        id="red-lowerleft" alt="corner image"/>
-      <img src="http://www.debian.org/Pics/red-upperright.png"
+      <img src="https://www.debian.org/Pics/red-upperright.png"
        id="red-upperright" alt="corner image"/>
-      <img src="http://www.debian.org/Pics/red-lowerright.png"
+      <img src="https://www.debian.org/Pics/red-lowerright.png"
        id="red-lowerright" alt="corner image"/>
        <span class="title">
          Debian NEW package overview for %(name)s
@@ -137,16 +136,7 @@ def html_header(name, missing):
  def html_footer():
      result = """    <p class="validate">Timestamp: %s (UTC)</p>
  """% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
-    result += """    <p><a href="http://validator.w3.org/check?uri=referer">
-      <img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"
-      style="border: none; height: 31px; width: 88px" /></a>
-    <a href="http://jigsaw.w3.org/css-validator/check/referer">
-      <img src="http://jigsaw.w3.org/css-validator/images/vcss"
-      alt="Valid CSS!" style="border: none; height: 31px; width: 88px" /></a>
-    </p>
-  </body>
-</html>
-"""
+    result += "</body></html>"
      return result
  
  ################################################################################
@@ -223,7 +213,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 +226,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: