X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=f1e5287f9b29f337a6d1629a194a2ae7b6a6f267;hb=b07852aa10727e959844a3f3b4d5b8a6bce00dbf;hp=af3bc58d534a9f445bbc3997f6d29c63fd85b5a0;hpb=06b17e68fd4a76e7a12f741f26654e55bff05c79;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index af3bc58d..f1e5287f 100644 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -36,8 +36,8 @@ import copy, glob, os, stat, sys, time import apt_pkg -import daklib.queue -import daklib.utils +import daklib.queue as queue +import daklib.utils as utils Cnf = None Upload = None @@ -309,7 +309,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 +321,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 utils.ParseMaintError, msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" maintainer["maintaineremail"] = "Unknown" @@ -335,7 +334,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 +422,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 +437,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()