@@ -217,10 +241,12 @@ def footer(): """ def table_header(type, source_count, total_count): - print "

Summary for: %s

" % (type) + print "

Summary for: %s

" % (type) + print "" % (type) print """ - " % (trclass) else: @@ -260,7 +291,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing print "" % (source) print "" print "" % (arch) print "" print "" % (last_mod) - (name, mail) = maint.split(":") + (name, mail) = maint.split(":", 1) print "" @@ -292,19 +324,55 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing ############################################################ -def process_changes_files(changes_files, type, log): +def update_graph_database(rrd_dir, type, n_source, n_binary): + if not rrd_dir: + return + + rrd_file = os.path.join(rrd_dir, type.lower()+'.rrd') + update = [rrd_file, "N:%s:%s" % (n_source, n_binary)] + + try: + rrdtool.update(*update) + except rrdtool.error: + create = [rrd_file]+""" +--step +300 +--start +0 +DS:ds0:GAUGE:7200:0:1000 +DS:ds1:GAUGE:7200:0:1000 +RRA:AVERAGE:0.5:1:599 +RRA:AVERAGE:0.5:6:700 +RRA:AVERAGE:0.5:24:775 +RRA:AVERAGE:0.5:288:795 +RRA:MAX:0.5:1:600 +RRA:MAX:0.5:6:700 +RRA:MAX:0.5:24:775 +RRA:MAX:0.5:288:795 +""".strip().split("\n") + try: + rc = rrdtool.create(*create) + ru = rrdtool.update(*update) + except rrdtool.error as e: + print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e)) + except NameError: + pass + +############################################################ + +def process_changes_files(changes_files, type, log, rrd_dir): msg = "" cache = {} # Read in all the .changes files for filename in changes_files: try: - Upload.pkg.changes_file = filename - Upload.init_vars() - Upload.update_vars() - cache[filename] = copy.copy(Upload.pkg.changes) + u = Upload() + u.load_changes(filename) + cache[filename] = copy(u.pkg.changes) cache[filename]["filename"] = filename - except: - break + except Exception, e: + print "WARNING: Exception %s" % e + continue # Divide the .changes into per-source groups per_source = {} for filename in cache.keys(): @@ -327,7 +395,7 @@ def process_changes_files(changes_files, type, log): else: if mtime < oldest: oldest = mtime - have_note += (d.has_key("process-new note")) + have_note += has_new_comment(d["source"], d["version"]) per_source[source]["oldest"] = oldest if not have_note: per_source[source]["note_state"] = 0; # none @@ -338,6 +406,8 @@ def process_changes_files(changes_files, type, log): per_source_items = per_source.items() per_source_items.sort(sg_compare) + update_graph_database(rrd_dir, type, len(per_source_items), len(changes_files)) + entries = [] max_source_len = 0 max_version_len = 0 @@ -356,14 +426,25 @@ def process_changes_files(changes_files, type, log): source = i[1]["list"][0]["source"] if len(source) > max_source_len: max_source_len = len(source) + binary_list = i[1]["list"][0]["binary"].keys() + binary = ', '.join(binary_list) arches = {} versions = {} for j in i[1]["list"]: + changesbase = os.path.basename(j["filename"]) + try: + session = DBConn().session() + dbc = session.query(DBChange).filter_by(changesname=changesbase).one() + session.close() + except Exception, e: + print "Can't find changes file in NEW for %s (%s)" % (changesbase, e) + dbc = None + 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"]) = \ - utils.fix_maintainer (j["maintainer"]) + fix_maintainer (j["maintainer"]) except ParseMaintError, msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" @@ -373,7 +454,7 @@ def process_changes_files(changes_files, type, log): try: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ - utils.fix_maintainer (j["changed-by"]) + fix_maintainer (j["changed-by"]) except ParseMaintError, msg: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ @@ -382,9 +463,14 @@ def process_changes_files(changes_files, type, log): distribution=j["distribution"].keys() closes=j["closes"].keys() - fingerprint=j["fingerprint"] - if j.has_key("sponsoremail"): - sponsor=j["sponsoremail"] + if dbc: + fingerprint = dbc.fingerprint + sponsor_name = get_uid_from_fingerprint(fingerprint).name + sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org" + if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \ + sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]: + sponsor = sponsor_email + for arch in j["architecture"].keys(): arches[arch] = "" version = j["version"] @@ -401,7 +487,7 @@ def process_changes_files(changes_files, type, log): note = " | [N]" else: note = "" - entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) + entries.append([source, binary, 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. @@ -412,16 +498,16 @@ def process_changes_files(changes_files, type, log): age = Cnf["Queue-Report::Options::Age"] if Cnf.has_key("Queue-Report::Options::New"): # If we produce html we always have oldest first. - direction.append([4,-1,"ao"]) + direction.append([5,-1,"ao"]) else: if Cnf.has_key("Queue-Report::Options::Sort"): for i in Cnf["Queue-Report::Options::Sort"].split(","): if i == "ao": # Age, oldest first. - direction.append([4,-1,age]) + direction.append([5,-1,age]) elif i == "an": # Age, newest first. - direction.append([4,1,age]) + direction.append([5,1,age]) elif i == "na": # Name, Ascending. direction.append([0,1,0]) @@ -430,10 +516,10 @@ def process_changes_files(changes_files, type, log): direction.append([0,-1,0]) elif i == "nl": # Notes last. - direction.append([3,1,0]) + direction.append([4,1,0]) elif i == "nf": # Notes first. - direction.append([3,-1,0]) + direction.append([4,-1,0]) entries.sort(lambda x, y: sortfunc(x, y)) # Yes, in theory you can add several sort options at the commandline with. But my mind is to small # at the moment to come up with a real good sorting function that considers all the sidesteps you @@ -443,11 +529,12 @@ def process_changes_files(changes_files, type, log): 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, changes_file) = entry + (source, binary, 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 log.write("Source: " + source + "\n") + log.write("Binary: " + binary + "\n") log.write("Version: " + version_list + "\n") log.write("Architectures: ") log.write( (", ".join(arch_list.split(" "))) + "\n") @@ -455,10 +542,10 @@ def process_changes_files(changes_files, type, log): log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n") log.write("Queue: " + type + "\n") - (name, mail) = maint.split(":") + (name, mail) = maint.split(":", 1) log.write("Maintainer: " + name + " <"+mail+">" + "\n") if changedby: - (name, mail) = changedby.split(":") + (name, mail) = changedby.split(":", 1) log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: log.write("Sponsored-By: " + sponsor + "\n") @@ -476,7 +563,7 @@ def process_changes_files(changes_files, type, log): log.write("\n") if Cnf.has_key("Queue-Report::Options::New"): - direction.append([4,1,"ao"]) + direction.append([5,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. @@ -485,7 +572,7 @@ def process_changes_files(changes_files, type, log): 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, undef) = entry + (source, binary, 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"): @@ -494,7 +581,7 @@ def process_changes_files(changes_files, type, log): msg = "" for entry in entries: - (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry + (source, binary, 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: @@ -511,7 +598,7 @@ def process_changes_files(changes_files, type, log): ################################################################################ def main(): - global Cnf, Upload + global Cnf Cnf = utils.get_conf() Arguments = [('h',"help","Queue-Report::Options::Help"), @@ -519,6 +606,7 @@ def main(): ('8','822',"Queue-Report::Options::822"), ('s',"sort","Queue-Report::Options::Sort", "HasArg"), ('a',"age","Queue-Report::Options::Age", "HasArg"), + ('r',"rrd","Queue-Report::Options::Rrd", "HasArg"), ('d',"directories","Queue-Report::Options::Directories", "HasArg")] for i in [ "help" ]: if not Cnf.has_key("Queue-Report::Options::%s" % (i)): @@ -530,11 +618,12 @@ def main(): if Options["Help"]: usage() - Upload = queue.Upload(Cnf) - if Cnf.has_key("Queue-Report::Options::New"): header() + # Initialize db so we can get the NEW comments + dbconn = DBConn() + directories = [ ] if Cnf.has_key("Queue-Report::Options::Directories"): @@ -545,6 +634,13 @@ def main(): else: directories = [ "byhand", "new" ] + if Cnf.has_key("Queue-Report::Options::Rrd"): + rrd_dir = Cnf["Queue-Report::Options::Rrd"] + elif Cnf.has_key("Dir::Rrd"): + rrd_dir = Cnf["Dir::Rrd"] + else: + rrd_dir = None + f = None if Cnf.has_key("Queue-Report::Options::822"): # Open the report file @@ -552,11 +648,22 @@ def main(): for directory in directories: changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)])) - process_changes_files(changes_files, directory, f) + process_changes_files(changes_files, directory, f, rrd_dir) if Cnf.has_key("Queue-Report::Options::822"): f.close() + if Cnf.has_key("Queue-Report::Options::New"): + for dir in directories: + print """ +

+""" % ((dir,)*12) + if Cnf.has_key("Queue-Report::Options::New"): footer()

+
Click to toggle all/binary-NEW packages
+
%s	" for vers in version.split(): - print "%s " % (source, utils.html_escape(vers), utils.html_escape(vers)) + print "%s " % (source, utils.html_escape(vers), utils.html_escape(vers)) print "	%s	" @@ -268,18 +299,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing print "%s " % (dist) print "	%s	" print "Maintainer: %s " % (utils.html_escape(mail), utils.html_escape(name)) - (name, mail) = changedby.split(":") + (name, mail) = changedby.split(":", 1) print "Changed-By: %s " % (utils.html_escape(mail), utils.html_escape(name)) - try: - (login, domain) = sponsor.split("@") - print "Sponsor: %s@debian.org " % (utils.html_escape(login), utils.html_escape(login)) - except: - pass + if sponsor: + try: + (login, domain) = sponsor.split("@", 1) + print "Sponsor: %s@debian.org " % (utils.html_escape(login), utils.html_escape(login)) + except Exception, e: + pass print "Fingerprint: %s" % (fingerprint) print "

Summary for: %s

Summary for: %s

Summary for: binary-%s only