X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=1423d7056eb791f3b7aa5767a9f48bf60d37a4b5;hb=b4e3c53932577a6320da839ef998c5710ddadd2b;hp=d73ca3565b1c48303424513e924ad8e161fb1aa8;hpb=eb7609bc253b856d1463610e4daa4f4c7aec7e90;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index d73ca356..1423d705 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -531,18 +531,18 @@ def check_pkg (upload): ## FIXME: horribly Debian specific -# def do_bxa_notification(): -# files = Upload.pkg.files -# summary = "" -# for f in files.keys(): -# if files[f]["type"] == "deb": -# control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(f))) -# summary += "\n" -# summary += "Package: %s\n" % (control.Find("Package")) -# summary += "Description: %s\n" % (control.Find("Description")) -# Upload.Subst["__BINARY_DESCRIPTIONS__"] = summary -# bxa_mail = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-new.bxa_notification") -# utils.send_mail(bxa_mail) +def do_bxa_notification(upload): + files = upload.pkg.files + summary = "" + for f in files.keys(): + if files[f]["type"] == "deb": + control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(f))) + summary += "\n" + summary += "Package: %s\n" % (control.Find("Package")) + summary += "Description: %s\n" % (control.Find("Description")) + upload.Subst["__BINARY_DESCRIPTIONS__"] = summary + bxa_mail = utils.TemplateSubst(upload.Subst,Config()["Dir::Templates"]+"/process-new.bxa_notification") + utils.send_mail(bxa_mail) ################################################################################ @@ -560,7 +560,7 @@ def add_overrides (new, upload, session): section_id = new[pkg]["section id"] Logger.log(["%s overrides" % (srcpkg), suite, new[pkg]["component"], new[pkg]["type"], new[pkg]["priority"], new[pkg]["section"]]) session.execute("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (:sid, :cid, :tid, :pkg, :pid, :sectid, '')", - { 'sid': suite.suiteid, 'cid': component_id, 'tid':type_id, 'pkg': pkg, 'pid': priority_id, 'sectid': section_id}) + { 'sid': suite_id, 'cid': component_id, 'tid':type_id, 'pkg': pkg, 'pid': priority_id, 'sectid': section_id}) for f in new[pkg]["files"]: if files[f].has_key("new"): del files[f]["new"] @@ -568,8 +568,8 @@ def add_overrides (new, upload, session): session.commit() -# if Cnf.FindB("Dinstall::BXANotify"): -# do_bxa_notification() + if Config().FindB("Dinstall::BXANotify"): + do_bxa_notification(upload) ################################################################################ @@ -695,7 +695,7 @@ def do_new(upload, session): try: check_daily_lock() done = add_overrides (new, upload, session) - Logger.log([utils.getusername(), "NEW ACCEPT: %s" % (upload.pkg.changes_file)]) + Logger.log(["NEW ACCEPT: %s" % (upload.pkg.changes_file)]) except CantGetLockError: print "Hello? Operator! Give me the number for 911!" print "Dinstall in the locked area, cant process packages, come back later" @@ -708,7 +708,7 @@ def do_new(upload, session): reject_message=Options["Manual-Reject"], note=get_new_comments(changes.get("source", ""), session=session)) if not aborted: - Logger.log([utils.getusername(), "NEW REJECT: %s" % (upload.pkg.changes_file)]) + Logger.log(["NEW REJECT: %s" % (upload.pkg.changes_file)]) os.unlink(upload.pkg.changes_file[:-8]+".dak") done = 1 elif answer == 'N': @@ -717,7 +717,7 @@ def do_new(upload, session): elif answer == 'P' and not Options["Trainee"]: prod_maintainer(get_new_comments(changes.get("source", ""), session=session), upload) - Logger.log([utils.getusername(), "NEW PROD: %s" % (upload.pkg.changes_file)]) + Logger.log(["NEW PROD: %s" % (upload.pkg.changes_file)]) elif answer == 'R' and not Options["Trainee"]: confirm = utils.our_raw_input("Really clear note (y/N)? ").lower() if confirm == "y": @@ -792,12 +792,12 @@ def do_byhand(upload, session): done = 1 for f in byhand: del files[f] - Logger.log([utils.getusername(), "BYHAND ACCEPT: %s" % (upload.pkg.changes_file)]) + Logger.log(["BYHAND ACCEPT: %s" % (upload.pkg.changes_file)]) except CantGetLockError: print "Hello? Operator! Give me the number for 911!" print "Dinstall in the locked area, cant process packages, come back later" elif answer == 'M': - Logger.log([utils.getusername(), "BYHAND REJECT: %s" % (upload.pkg.changes_file)]) + Logger.log(["BYHAND REJECT: %s" % (upload.pkg.changes_file)]) upload.do_reject(manual=1, reject_message=Options["Manual-Reject"]) os.unlink(upload.pkg.changes_file[:-8]+".dak") done = 1 @@ -973,6 +973,14 @@ def do_pkg(changes_file, session): u = Upload() u.pkg.load_dot_dak(changes_file) u.update_subst() + + cnf = Config() + bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" + if cnf.has_key("Dinstall::Bcc"): + u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) + else: + u.Subst["__BCC__"] = bcc + files = u.pkg.files try: @@ -1009,7 +1017,7 @@ def end(): if accept_count > 1: sets = "sets" sys.stderr.write("Accepted %d package %s, %s.\n" % (accept_count, sets, utils.size_type(int(accept_bytes)))) - Logger.log([utils.getusername(), "total",accept_count,accept_bytes]) + Logger.log(["total",accept_count,accept_bytes]) if not Options["No-Action"] and not Options["Trainee"]: Logger.close() @@ -1073,7 +1081,7 @@ def main(): cnf = Config() session = DBConn().session() - + Arguments = [('a',"automatic","Process-New::Options::Automatic"), ('h',"help","Process-New::Options::Help"), ('C',"comments-dir","Process-New::Options::Comments-Dir", "HasArg"), @@ -1110,11 +1118,6 @@ def main(): # Kill me now? **FIXME** cnf["Dinstall::Options::No-Mail"] = "" -# bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" -# if cnf.has_key("Dinstall::Bcc"): -# Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) -# else: -# Upload.Subst["__BCC__"] = bcc # commentsdir = cnf.get("Process-New::Options::Comments-Dir","") # if commentsdir: