dak/show_new.py: Replace Changes() object use with an Upload() object.

[dak.git] / dak / show_new.py

diff --git a/dak/show_new.py b/dak/show_new.py
index 4b485f2669ad7e0a642ff2d3712809f5a7b4b79f..b67930a2616e44ab25e0f8a7cea9c925f44db7c1 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Output html for packages in NEW
+""" Output html for packages in NEW """
 # Copyright (C) 2007 Joerg Jaspert <joerg@debian.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -25,18 +25,18 @@
 
 ################################################################################
 
-import copy, os, sys, time
+from copy import copy
+import os, sys, time
 import apt_pkg
 import examine_package
-from daklib import database
-from daklib import queue
+
+from daklib.queue import determine_new, check_valid, Upload
 from daklib import utils
+from daklib.regexes import re_source_ext
 
 # Globals
 Cnf = None
 Options = None
-Upload = None
-projectB = None
 sources = set()
 
 
@@ -140,16 +140,15 @@ def html_footer():
 
 
 def do_pkg(changes_file):
-    Upload.pkg.changes_file = changes_file
-    Upload.init_vars()
-    Upload.update_vars()
-    files = Upload.pkg.files
-    changes = Upload.pkg.changes
-
-    changes["suite"] = copy.copy(changes["distribution"])
+    upload = Upload()
+    upload.load_changes(changes_file)
 
+    files = upload.pkg.files
+    changes = upload.pkg.changes
+    upload.pkg.changes["suite"] = copy(upload.pkg.changes["distribution"])
+    distribution = upload.pkg.changes["distribution"].keys()[0]
     # Find out what's new
-    new = queue.determine_new(changes, files, projectB, 0)
+    new = determine_new(upload.pkg.changes, upload.pkg.files, 0)
 
     stdout_fd = sys.stdout
 
@@ -162,19 +161,20 @@ def do_pkg(changes_file):
         filestoexamine = []
         for pkg in new.keys():
             for fn in new[pkg]["files"]:
-                if ( files[fn].has_key("new") and not
-                     files[fn]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
+                if (files[fn].has_key("new") and
+                    (files[fn]["type"] == "dsc" or
+                     not re_source_ext.match(files[fn]["type"]))):
                     filestoexamine.append(fn)
 
         html_header(changes["source"], filestoexamine)
 
-        queue.check_valid(new)
-        examine_package.display_changes(Upload.pkg.changes_file)
+        check_valid(new)
+        examine_package.display_changes( distribution, 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:
@@ -193,7 +193,7 @@ def usage (exit_code=0):
 ################################################################################
 
 def init():
-    global Cnf, Options, Upload, projectB
+    global Cnf, Options
 
     Cnf = utils.get_conf()
 
@@ -210,10 +210,6 @@ def init():
     if Options["help"]:
         usage()
 
-    Upload = queue.Upload(Cnf)
-
-    projectB = Upload.projectB
-
     return changes_files