X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=ce88d09ffc235acd4f9531dad344cf896bf7261e;hb=d6c675a02c32f25a25748834c8e80a3577ec9f25;hp=af3bc58d534a9f445bbc3997f6d29c63fd85b5a0;hpb=d9822f04453a1b62ca0aa66e2efeea35f654778f;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
old mode 100644
new mode 100755
index af3bc58d..ce88d09f
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -36,8 +36,10 @@
import copy, glob, os, stat, sys, time
import apt_pkg
-import daklib.queue
-import daklib.utils
+import cgi
+from daklib import queue
+from daklib import utils
+from daklib.dak_exceptions import *
Cnf = None
Upload = None
@@ -51,6 +53,7 @@ def usage(exit_code=0):
Prints a report of packages in queue directories (usually new and byhand).
-h, --help show this help and exit.
+ -8, --822 writes 822 formated output to the location set in dak.conf
-n, --new produce html-output
-s, --sort=key sort output according to key, see below.
-a, --age=key if using sort by age, how should time be treated?
@@ -156,106 +159,139 @@ def sortfunc(a,b):
############################################################
def header():
- print """
-
- Debian NEW and BYHAND Packages
-
-
-
-
-
-
-
-
-
-
- Debian NEW and BYHAND Packages
-
-
-
-
-
-
-
-
-
-
- """
+ print """
+
+
+
+
+
+
+ Debian NEW and BYHAND Packages
+
+
+
+
+
+
+
+
+
+
+
+ Debian NEW and BYHAND Packages
+
+
+ """
def footer():
- print "Timestamp: %s (UTC)
" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- print "Hint: Age is the youngest upload of the package, if there is more than one version.
"
- print "You may want to look at the REJECT-FAQ for possible reasons why one of the above packages may get rejected.
"
- print """
-
-
-
+ print "Timestamp: %s (UTC)
" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+
+ print """
+
"""
- print ""
-def table_header(type):
+def table_header(type, source_count, total_count):
print "Summary for: %s " % (type)
- print """
+ print """
+
+
+ """
+ print "Package count in %s : %s | Total Package count: %s " % (type, source_count, total_count)
+ print """
+
+
- Package
- Version
- Arch
- Distribution
- Age
- Maintainer
- Closes
+ Package
+ Version
+ Arch
+ Distribution
+ Age
+ Upload info
+ Closes
- """
+
+
+ """
-def table_footer(type, source_count, total_count):
- print "
\n"
- print "Package count in %s : %s \n" % (type, source_count)
- print " Total Package count: %s
\n" % (total_count)
+def table_footer(type):
+ print "
"
-def table_row(source, version, arch, last_mod, maint, distribution, closes):
+def table_row(source, version, arch, last_mod, maint, distribution, closes, fingerprint, sponsor, changedby):
global row_number
+ trclass = "sid"
+ for dist in distribution:
+ if dist == "experimental":
+ trclass = "exp"
+
if row_number % 2 != 0:
- print ""
+ print " " % (trclass)
else:
- print " "
+ print " " % (trclass)
- tdclass = "sid"
- for dist in distribution:
- if dist == "experimental":
- tdclass = "exp"
- print "%s " % (tdclass, source)
- print "" % (tdclass)
+ print " %s " % (source)
+ print ""
for vers in version.split():
- print "%s " % (source, vers, vers)
- print " %s " % (tdclass, arch, tdclass)
+ print "%s " % (source, utils.html_escape(vers), utils.html_escape(vers))
+ print " "
+ print "%s " % (arch)
+ print ""
for dist in distribution:
- print "%s " % (dist)
- print " %s " % (tdclass, last_mod)
+ print "%s " % (dist)
+ print ""
+ print "%s " % (last_mod)
(name, mail) = maint.split(":")
- print "%s " % (tdclass, mail, name)
- print "" % (tdclass)
+ print " "
+ print "Maintainer: %s " % (utils.html_escape(mail), utils.html_escape(name))
+ (name, mail) = changedby.split(":")
+ print "Changed-By: %s " % (utils.html_escape(mail), utils.html_escape(name))
+
+ try:
+ (login, domain) = sponsor.split("@")
+ print "@debian.org " % (utils.html_escape(login), utils.html_escape(login))
+ except:
+ pass
+
+ print "Fingerprint: %s " % (fingerprint)
+ print " "
+
+ print ""
for close in closes:
- print "#%s " % (close, close)
+ print "#%s " % (utils.html_escape(close), utils.html_escape(close))
print " "
row_number+=1
############################################################
-def process_changes_files(changes_files, type):
+def process_changes_files(changes_files, type, log):
msg = ""
cache = {}
# Read in all the .changes files
@@ -305,12 +341,15 @@ def process_changes_files(changes_files, type):
max_source_len = 0
max_version_len = 0
max_arch_len = 0
- maintainer = {}
- maint=""
- distribution=""
- closes=""
- source_exists=""
for i in per_source_items:
+ maintainer = {}
+ maint=""
+ distribution=""
+ closes=""
+ fingerprint=""
+ changeby = {}
+ changedby=""
+ sponsor=""
last_modified = time.time()-i[1]["oldest"]
source = i[1]["list"][0]["source"]
if len(source) > max_source_len:
@@ -318,24 +357,38 @@ def process_changes_files(changes_files, type):
arches = {}
versions = {}
for j in i[1]["list"]:
- if Cnf.has_key("Queue-Report::Options::New"):
+ if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"):
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"
maint="%s:%s" % (maintainer["maintainername"], maintainer["maintaineremail"])
+ # ...likewise for the Changed-By: field if it exists.
+ try:
+ (changeby["changedby822"], changeby["changedby2047"],
+ changeby["changedbyname"], changeby["changedbyemail"]) = \
+ utils.fix_maintainer (j["changed-by"])
+ except ParseMaintError, msg:
+ (changeby["changedby822"], changeby["changedby2047"],
+ changeby["changedbyname"], changeby["changedbyemail"]) = \
+ ("", "", "", "")
+ changedby="%s:%s" % (changeby["changedbyname"], changeby["changedbyemail"])
+
distribution=j["distribution"].keys()
closes=j["closes"].keys()
+ fingerprint=j["fingerprint"]
+ if j.has_key("sponsoremail"):
+ sponsor=j["sponsoremail"]
for arch in j["architecture"].keys():
arches[arch] = ""
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:
@@ -346,7 +399,7 @@ def process_changes_files(changes_files, type):
note = " | [N]"
else:
note = ""
- entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes])
+ entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby])
# direction entry consists of "Which field, which direction, time-consider" where
# time-consider says how we should treat last_modified. Thats all.
@@ -385,26 +438,59 @@ def process_changes_files(changes_files, type):
# have with it. (If you combine options it will simply take the last one at the moment).
# Will be enhanced in the future.
+ if Cnf.has_key("Queue-Report::Options::822"):
+ # print stuff out in 822 format
+ for entry in entries:
+ (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
+
+ # We'll always have Source, Version, Arch, Mantainer, and Dist
+ # For the rest, check to see if we have them, then print them out
+ log.write("Source: " + source + "\n")
+ log.write("Version: " + version_list + "\n")
+ log.write("Architectures: ")
+ log.write( (", ".join(arch_list.split(" "))) + "\n")
+ log.write("Age: " + time_pp(last_modified) + "\n")
+ log.write("Queue: " + type + "\n")
+
+ (name, mail) = maint.split(":")
+ log.write("Maintainer: " + name + " <"+mail+">" + "\n")
+ if changedby:
+ (name, mail) = changedby.split(":")
+ log.write("Changed-By: " + name + " <"+mail+">" + "\n")
+ if sponsor:
+ log.write("Sponsored-By: " + sponsor + "\n")
+ log.write("Distribution:")
+ for dist in distribution:
+ log.write(" " + dist)
+ log.write("\n")
+ log.write("Fingerprint: " + fingerprint + "\n")
+ if closes:
+ bug_string = ""
+ for bugs in closes:
+ bug_string += "#"+bugs+", "
+ log.write("Closes: " + bug_string[:-2] + "\n")
+ log.write("\n")
+
if Cnf.has_key("Queue-Report::Options::New"):
direction.append([4,1,"ao"])
entries.sort(lambda x, y: sortfunc(x, y))
# Output for a html file. First table header. then table_footer.
# Any line between them is then a printed from subroutine table_row.
if len(entries) > 0:
- table_header(type.upper())
- for entry in entries:
- (source, version_list, arch_list, note, last_modified, maint, distribution, closes) = entry
- table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes)
total_count = len(changes_files)
source_count = len(per_source_items)
- table_footer(type.upper(), source_count, total_count)
- else:
+ table_header(type.upper(), source_count, total_count)
+ for entry in entries:
+ (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
+ table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby)
+ table_footer(type.upper())
+ elif not Cnf.has_key("Queue-Report::Options::822"):
# The "normal" output without any formatting.
format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len)
msg = ""
for entry in entries:
- (source, version_list, arch_list, note, last_modified, undef, undef, undef) = entry
+ (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry
msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
if msg:
@@ -423,9 +509,10 @@ 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"),
+ ('8','822',"Queue-Report::Options::822"),
('s',"sort","Queue-Report::Options::Sort", "HasArg"),
('a',"age","Queue-Report::Options::Age", "HasArg")]
for i in [ "help" ]:
@@ -438,7 +525,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()
@@ -447,9 +534,17 @@ def main():
if not directories:
directories = [ "byhand", "new" ]
+ f = None
+ if Cnf.has_key("Queue-Report::Options::822"):
+ # Open the report file
+ f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w")
+
for directory in directories:
changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)]))
- process_changes_files(changes_files, directory)
+ process_changes_files(changes_files, directory, f)
+
+ if Cnf.has_key("Queue-Report::Options::822"):
+ f.close()
if Cnf.has_key("Queue-Report::Options::New"):
footer()