Merge first version of Marks cleanup branch

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

old mode 100644 (file)

new mode 100755 (executable)

index 34baba9..a18847c
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -29,7 +29,7 @@ import copy, os, sys, time
  import apt_pkg
  import examine_package
  import daklib.database
-import daklib.queue
+import daklib.queue as queue
  import daklib.utils
  
  # Globals
@@ -53,7 +53,7 @@ def html_header(name, filestoexamine):
      <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8"
      />
      <title>%(name)s - Debian NEW package overview</title>
-    <link type="text/css" rel="stylesheet" href="style.css" />
+    <link type="text/css" rel="stylesheet" href="/style.css" />
      <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
      <script type="text/javascript">
        //<![CDATA[
@@ -79,7 +79,7 @@ def html_header(name, filestoexamine):
        //]]>
      </script>
    </head>
-  <body>
+  <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"
@@ -89,7 +89,6 @@ def html_header(name, filestoexamine):
          alt="Debian Project" /></a>
      </div>
      <div id="titleblock">
-
        <img src="http://www.debian.org/Pics/red-upperleft.png"
        id="red-upperleft" alt="corner image"/>
        <img src="http://www.debian.org/Pics/red-lowerleft.png"
@@ -150,7 +149,7 @@ def do_pkg(changes_file):
      changes["suite"] = copy.copy(changes["distribution"])
  
      # Find out what's new
-    new = daklib.queue.determine_new(changes, files, projectB, 0)
+    new = queue.determine_new(changes, files, projectB, 0)
  
      stdout_fd = sys.stdout
  
@@ -169,7 +168,7 @@ def do_pkg(changes_file):
  
          html_header(changes["source"], filestoexamine)
  
-        daklib.queue.check_valid(new)
+        queue.check_valid(new)
          examine_package.display_changes(Upload.pkg.changes_file)
  
          for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
@@ -211,7 +210,7 @@ def init():
      if Options["help"]:
          usage()
  
-    Upload = daklib.queue.Upload(Cnf)
+    Upload = queue.Upload(Cnf)
  
      projectB = Upload.projectB
  
@@ -234,8 +233,8 @@ def main():
          do_pkg (changes_file)
      files = set(os.listdir(Cnf["Show-New::HTMLPath"]))
      to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
-    for file in to_delete:
-        os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file))
+    for f in to_delete:
+        os.remove(os.path.join(Cnf["Show-New::HTMLPath"],f))
  
  ################################################################################