-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 queues to be scanned
Sorting Keys: ao=age, oldest first. an=age, newest first.
na=name, ascending nd=name, descending
############################################################
-def process_changes_files(changes_files, type):
+def process_changes_files(changes_files, type, log):
msg = ""
cache = {}
# Read in all the .changes files
changeby = {}
changedby=""
sponsor=""
+ filename=i[1]["list"][0]["filename"]
last_modified = time.time()-i[1]["oldest"]
source = i[1]["list"][0]["source"]
if len(source) > max_source_len:
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"]) = \
note = " | [N]"
else:
note = ""
- entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby])
+ entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename])
# direction entry consists of "Which field, which direction, time-consider" where
# time-consider says how we should treat last_modified. Thats all.
# 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
+ (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = 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("Changes-File: " + os.path.basename(changes_file) + "\n")
+ log.write("\n")
if Cnf.has_key("Queue-Report::Options::New"):
direction.append([4,1,"ao"])
source_count = len(per_source_items)
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
+ (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = 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)
msg = ""
for entry in entries:
- (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry
+ (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry
msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
if msg:
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)] = ""
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()
projects / dak.git / blobdiff