Merge branch 'master' into security

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
old mode 100644 (file)
new mode 100755 (executable)
index af3bc58..aa1c54d
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -36,8 +36,9 @@
 
 import copy, glob, os, stat, sys, time
 import apt_pkg
-import daklib.queue
-import daklib.utils
+from daklib import queue
+from daklib import utils
+from daklib.dak_exceptions import *
 
 Cnf = None
 Upload = None
@@ -309,7 +310,6 @@ def process_changes_files(changes_files, type):
     maint=""
     distribution=""
     closes=""
-    source_exists=""
     for i in per_source_items:
         last_modified = time.time()-i[1]["oldest"]
         source = i[1]["list"][0]["source"]
@@ -322,8 +322,8 @@ def process_changes_files(changes_files, type):
                 try:
                     (maintainer["maintainer822"], maintainer["maintainer2047"],
                     maintainer["maintainername"], maintainer["maintaineremail"]) = \
-                    daklib.utils.fix_maintainer (j["maintainer"])
-                except daklib.utils.ParseMaintError, msg:
+                    utils.fix_maintainer (j["maintainer"])
+                except ParseMaintError, msg:
                     print "Problems while parsing maintainer address\n"
                     maintainer["maintainername"] = "Unknown"
                     maintainer["maintaineremail"] = "Unknown"
@@ -335,7 +335,7 @@ def process_changes_files(changes_files, type):
             version = j["version"]
             versions[version] = ""
         arches_list = arches.keys()
-        arches_list.sort(daklib.utils.arch_compare_sw)
+        arches_list.sort(utils.arch_compare_sw)
         arch_list = " ".join(arches_list)
         version_list = " ".join(versions.keys())
         if len(version_list) > max_version_len:
@@ -423,7 +423,7 @@ def process_changes_files(changes_files, type):
 def main():
     global Cnf, Upload
 
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
     Arguments = [('h',"help","Queue-Report::Options::Help"),
                  ('n',"new","Queue-Report::Options::New"),
                  ('s',"sort","Queue-Report::Options::Sort", "HasArg"),
@@ -438,7 +438,7 @@ def main():
     if Options["Help"]:
         usage()
 
-    Upload = daklib.queue.Upload(Cnf)
+    Upload = queue.Upload(Cnf)
 
     if Cnf.has_key("Queue-Report::Options::New"):
         header()