X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=cdc489c855f2e8a59173216109b4b614399c2a6a;hb=474740a682b513d27a1d2122dffd20735e015d18;hp=dcff06ea27ccb08e37b9034574fe044f126db5a4;hpb=04aafc8212af621e172df8892735d980a83269e2;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index dcff06ea..cdc489c8 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -53,11 +53,12 @@ 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 produce 822 formated output + -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? If not given a default of hours will be used. + -d, --directories=key A comma seperated list of directories to be scanned Sorting Keys: ao=age, oldest first. an=age, newest first. na=name, ascending nd=name, descending @@ -291,7 +292,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing ############################################################ -def process_changes_files(changes_files, type): +def process_changes_files(changes_files, type, log): msg = "" cache = {} # Read in all the .changes files @@ -357,7 +358,7 @@ def process_changes_files(changes_files, type): arches = {} versions = {} for j in i[1]["list"]: - if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options:822"): + 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"]) = \ @@ -438,42 +439,39 @@ 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"): - # Open the report file - f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") - + 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 - 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") - + 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(":") - f.write("Maintainer: " + name + " <"+mail+">" + "\n") + log.write("Maintainer: " + name + " <"+mail+">" + "\n") if changedby: (name, mail) = changedby.split(":") - f.write("Changed-By: " + name + " <"+mail+">" + "\n") + log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: - (name, mail) = sponsor.split(":") - f.write("Sponsored-By: " + name + " <"+mail+">" + "\n") - f.write("Distribution:") + log.write("Sponsored-By: " + sponsor + "\n") + log.write("Distribution:") for dist in distribution: - f.write(" " + dist) - f.write("\n") - f.write("Fingerprint: " + fingerprint + "\n") + log.write(" " + dist) + log.write("\n") + log.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() + log.write("Closes: " + bug_string[:-2] + "\n") + log.write("\n") if Cnf.has_key("Queue-Report::Options::New"): direction.append([4,1,"ao"]) @@ -488,7 +486,7 @@ def process_changes_files(changes_files, type): (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"): + 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) @@ -516,9 +514,10 @@ def main(): Cnf = utils.get_conf() Arguments = [('h',"help","Queue-Report::Options::Help"), ('n',"new","Queue-Report::Options::New"), - ('8','822',"Queue-Report::Options:822"), + ('8','822',"Queue-Report::Options::822"), ('s',"sort","Queue-Report::Options::Sort", "HasArg"), - ('a',"age","Queue-Report::Options::Age", "HasArg")] + ('a',"age","Queue-Report::Options::Age", "HasArg"), + ('d',"directories","Queue-Report::Options::Directories", "HasArg")] for i in [ "help" ]: if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" @@ -534,13 +533,27 @@ def main(): if Cnf.has_key("Queue-Report::Options::New"): header() - directories = Cnf.ValueList("Queue-Report::Directories") - if not directories: + directories = [ ] + + if Cnf.has_key("Queue-Report::Options::Directories"): + for i in Cnf["Queue-Report::Options::Directories"].split(","): + directories.append(i) + elif Cnf.has_key("Queue-Report::Directories"): + directories = Cnf.ValueList("Queue-Report::Directories") + else: 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()