" % (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 +342,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 +358,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 +400,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 +439,60 @@ 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("Last-Modified: " + str(int(time.time()) - int(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 
-
- 
- 
+ print "" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+
+ print """
+