]> git.decadent.org.uk Git - dak.git/blobdiff - dak/show_new.py
projects / dak.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge commit 'ftpmaster/master' into psycopg2
[dak.git] / dak / show_new.py
diff --git a/dak/show_new.py b/dak/show_new.py
index a35f4d65d4efa88b1c5d83fade12468293ef105e..f650f9aa03aae6271eee09fb6f8c42c6c296f603 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -28,9 +28,9 @@
 import copy, os, sys, time
 import apt_pkg
 import examine_package
-import daklib.database
-import daklib.queue 
-import daklib.utils
+from daklib import database
+from daklib import queue
+from daklib import utils
 
 # Globals
 Cnf = None
@@ -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"
@@ -113,17 +112,17 @@ def html_header(name, filestoexamine):
       <p><a href="#source-lintian" onclick="show('source-lintian-body')">source lintian</a></p>
       """
     for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
-      packagename = fn.split('_')[0]
-      print """
-      <p class="subtitle">%(pkg)s</p>
-      <p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
-      <p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
-      <p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
-      <p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
-      <p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
-      """%{"pkg":packagename}
+        packagename = fn.split('_')[0]
+        print """
+        <p class="subtitle">%(pkg)s</p>
+        <p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
+        <p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
+        <p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
+        <p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
+        <p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
+        """%{"pkg":packagename}
     print "    </div>"
-   
+
 def html_footer():
     print """    <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
     print """    <p><a href="http://validator.w3.org/check?uri=referer">
@@ -148,9 +147,9 @@ def do_pkg(changes_file):
     changes = Upload.pkg.changes
 
     changes["suite"] = copy.copy(changes["distribution"])
-
+    distribution = changes["distribution"].keys()[0]
     # 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,13 +168,13 @@ def do_pkg(changes_file):
 
         html_header(changes["source"], filestoexamine)
 
-        daklib.queue.check_valid(new)
-        examine_package.display_changes(Upload.pkg.changes_file)
+        queue.check_valid(new)
+        examine_package.display_changes( distribution, Upload.pkg.changes_file)
 
         for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
-            examine_package.check_dsc(fn)
+            examine_package.check_dsc(distribution, fn)
         for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
-            examine_package.check_deb(fn)
+            examine_package.check_deb(distribution, fn)
 
         html_footer()
         if sys.stdout != stdout_fd:
@@ -196,7 +195,7 @@ def usage (exit_code=0):
 def init():
     global Cnf, Options, Upload, projectB
 
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
 
     Arguments = [('h',"help","Show-New::Options::Help"),
                  ("p","html-path","Show-New::HTMLPath","HasArg")]
@@ -211,7 +210,7 @@ def init():
     if Options["help"]:
         usage()
 
-    Upload = daklib.queue.Upload(Cnf)
+    Upload = queue.Upload(Cnf)
 
     projectB = Upload.projectB
 
@@ -227,15 +226,15 @@ def main():
     examine_package.use_html=1
 
     for changes_file in changes_files:
-        changes_file = daklib.utils.validate_changes_file_arg(changes_file, 0)
+        changes_file = utils.validate_changes_file_arg(changes_file, 0)
         if not changes_file:
             continue
         print "\n" + changes_file
         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))
 
 ################################################################################
 
dak changes to support and test code signing