X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a4cee3591fc57abc1e1de905563fa860d2ba6471;hb=3f4d9093048af1545f78aef3b5236a1e8094fa89;hp=a8ae08d4f373ef4a9cbec07df115c23a02f4b479;hpb=7aaaad3135c9164390af5897925660842368660b;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index a8ae08d4..a4cee359 100755
--- 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 dak.lib.queue as queue
-import dak.lib.utils as utils
+import daklib.queue
+import daklib.utils
Cnf = None
Upload = None
@@ -157,7 +157,7 @@ def sortfunc(a,b):
def header():
print """
-
+
Debian NEW and BYHAND Packages
@@ -222,11 +222,6 @@ def table_footer(type, source_count, total_count):
print "Package count in %s: %s\n" % (type, source_count)
print "
Total Package count: %s
\n" % (total_count)
-def force_to_latin(s):
- """Forces a string to Latin-1."""
- latin1_s = unicode(s,'utf-8')
- return latin1_s.encode('iso8859-1', 'replace')
-
def table_row(source, version, arch, last_mod, maint, distribution, closes):
@@ -250,7 +245,6 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes):
print "%s
" % (dist)
print "%s | " % (tdclass, last_mod)
(name, mail) = maint.split(":")
- name = force_to_latin(name)
print "%s | " % (tdclass, mail, name)
print "" % (tdclass)
@@ -328,8 +322,8 @@ def process_changes_files(changes_files, type):
try:
(maintainer["maintainer822"], maintainer["maintainer2047"],
maintainer["maintainername"], maintainer["maintaineremail"]) = \
- utils.fix_maintainer (j["maintainer"])
- except utils.ParseMaintError, msg:
+ daklib.utils.fix_maintainer (j["maintainer"])
+ except daklib.utils.ParseMaintError, msg:
print "Problems while parsing maintainer address\n"
maintainer["maintainername"] = "Unknown"
maintainer["maintaineremail"] = "Unknown"
@@ -341,7 +335,7 @@ def process_changes_files(changes_files, type):
version = j["version"]
versions[version] = ""
arches_list = arches.keys()
- arches_list.sort(utils.arch_compare_sw)
+ arches_list.sort(daklib.utils.arch_compare_sw)
arch_list = " ".join(arches_list)
version_list = " ".join(versions.keys())
if len(version_list) > max_version_len:
@@ -429,7 +423,7 @@ def process_changes_files(changes_files, type):
def main():
global Cnf, Upload
- Cnf = utils.get_conf()
+ Cnf = daklib.utils.get_conf()
Arguments = [('h',"help","Queue-Report::Options::Help"),
('n',"new","Queue-Report::Options::New"),
('s',"sort","Queue-Report::Options::Sort", "HasArg"),
@@ -444,7 +438,7 @@ def main():
if Options["Help"]:
usage()
- Upload = queue.Upload(Cnf)
+ Upload = daklib.queue.Upload(Cnf)
if Cnf.has_key("Queue-Report::Options::New"):
header()
|