X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=11950f14429e41a654167b110822de96fd70e6e7;hb=4d8b174b33c1816762251a27dc9325138c8d8f6b;hp=1c2231a305709baf6ff7379fd55fbbe9868ce1d0;hpb=e2c4fd7f21c3b33cd7192bded5d6373e0ee90374;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index 1c2231a3..11950f14 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -368,10 +368,10 @@ def do_bxa_notification(upload): summary = "" for f in files.keys(): if files[f]["type"] == "deb": - control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(f))) + control = apt_pkg.TagSection(utils.deb_extract_control(utils.open_file(f))) summary += "\n" - summary += "Package: %s\n" % (control.Find("Package")) - summary += "Description: %s\n" % (control.Find("Description")) + 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) @@ -400,7 +400,7 @@ def add_overrides (new, upload, session): session.commit() - if Config().FindB("Dinstall::BXANotify"): + if Config().find_b("Dinstall::BXANotify"): do_bxa_notification(upload) ################################################################################ @@ -774,14 +774,14 @@ def main(): if not cnf.has_key("Process-New::Options::%s" % (i)): cnf["Process-New::Options::%s" % (i)] = "" - changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv) + changes_files = apt_pkg.parse_commandline(cnf.Cnf,Arguments,sys.argv) if len(changes_files) == 0: new_queue = get_policy_queue('new', session ); changes_paths = [ os.path.join(new_queue.path, j) for j in utils.get_changes_files(new_queue.path) ] else: changes_paths = [ os.path.abspath(j) for j in changes_files ] - Options = cnf.SubTree("Process-New::Options") + Options = cnf.subtree("Process-New::Options") if Options["Help"]: usage()