From: Joerg Jaspert Date: Tue, 23 Dec 2008 23:55:32 +0000 (+0100) Subject: Merge commit 'ncomm/master' into merge X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a53c66d1243e141b7131ab08fcf44648caaf069;p=dak Merge commit 'ncomm/master' into merge * commit 'ncomm/master': Added changelog and config file settings Clarified help message Added 822 reported to queue_report to writing out to a file Signed-off-by: Joerg Jaspert --- 5a53c66d1243e141b7131ab08fcf44648caaf069 diff --cc dak/queue_report.py index 33e26594,ecf52e16..59f1b7f4 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@@ -437,6 -438,43 +438,43 @@@ def process_changes_files(changes_files # 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"): - # Open the report file ++ # Open the report file + f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") + + # 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 + f.write("Source: " + source + "\n") + f.write("Version: " + version_list + "\n") + f.write("Architectures:") + f.write( (", ".join(arch_list.split(" "))) + "\n") + f.write("Age: " + time_pp(last_modified) + "\n") - ++ + (name, mail) = maint.split(":") + f.write("Maintainer: " + name + " <"+mail+">" + "\n") + if changedby: + (name, mail) = changedby.split(":") + f.write("Changed-By: " + name + " <"+mail+">" + "\n") + if sponsor: + (name, mail) = sponsor.split(":") + f.write("Sponsored-By: " + name + " <"+mail+">" + "\n") + f.write("Distribution:") + for dist in distribution: + f.write(" " + dist) + f.write("\n") + f.write("Fingerprint: " + fingerprint + "\n") + if closes: + bug_string = "" + for bugs in closes: + bug_string += "#"+bugs+", " + f.write("Closes: " + bug_string[:-2] + "\n") + f.write("\n") + f.close() + if Cnf.has_key("Queue-Report::Options::New"): direction.append([4,1,"ao"]) entries.sort(lambda x, y: sortfunc(x, y))