From 77bd8c2de837c0deb2255e12130712b4662a03f9 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Mon, 26 Oct 2009 16:54:40 +0000 Subject: [PATCH] initialise template variables Signed-off-by: Mark Hymers --- dak/process_unchecked.py | 3 ++- daklib/queue.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index a40118d4..fafff7ba 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -427,6 +427,7 @@ def acknowledge_new(u, summary, short_summary): if not Options["No-Mail"]: print "Sending new ack." template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new') + u.update_subst() u.Subst["__SUMMARY__"] = summary new_ack_message = utils.TemplateSubst(u.Subst, template) utils.send_mail(new_ack_message) @@ -495,7 +496,7 @@ def process_it(changes_file): valid_changes_p = u.load_changes(changespath) else: valid_changes_p = False - u.rejects.extend(rejects) + u.rejects.extend(rejects) if valid_changes_p: while u.reprocess: diff --git a/daklib/queue.py b/daklib/queue.py index ea7f7659..9ea69c41 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1474,6 +1474,7 @@ class Upload(object): for bug in bugs: summary += "%s " % (bug) if action: + self.update_subst() self.Subst["__BUG_NUMBER__"] = bug if self.pkg.changes["distribution"].has_key("stable"): self.Subst["__STABLE_WARNING__"] = """ @@ -1484,8 +1485,8 @@ The update will eventually make its way into the next released Debian distribution.""" else: self.Subst["__STABLE_WARNING__"] = "" - mail_message = utils.TemplateSubst(self.Subst, template) - utils.send_mail(mail_message) + mail_message = utils.TemplateSubst(self.Subst, template) + utils.send_mail(mail_message) # Clear up after ourselves del self.Subst["__BUG_NUMBER__"] @@ -1537,6 +1538,7 @@ distribution.""" summary += "Announcing to %s\n" % (announce_list) if action: + self.update_subst() self.Subst["__ANNOUNCE_LIST_ADDRESS__"] = announce_list if cnf.get("Dinstall::TrackingServer") and \ self.pkg.changes["architecture"].has_key("source"): @@ -1601,6 +1603,7 @@ distribution.""" # Send accept mail, announce to lists, close bugs and check for # override disparities if not cnf["Dinstall::Options::No-Mail"]: + self.update_subst() self.Subst["__SUITE__"] = "" self.Subst["__SUMMARY__"] = summary mail_message = utils.TemplateSubst(self.Subst, accepttemplate) @@ -1686,6 +1689,7 @@ distribution.""" overridetemplate = os.path.join(cnf["Dir::Templates"], 'process-unchecked.override-disparity') + self.update_subst() self.Subst["__SUMMARY__"] = summary mail_message = utils.TemplateSubst(self.Subst, overridetemplate) utils.send_mail(mail_message) @@ -1832,6 +1836,7 @@ distribution.""" rej_template = os.path.join(cnf["Dir::Templates"], "queue.rejected") + self.update_subst() if not manual: self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"] self.Subst["__MANUAL_REJECT_MESSAGE__"] = "" @@ -2243,6 +2248,7 @@ distribution.""" def do_unaccept(self): cnf = Config() + self.update_subst() self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"] self.Subst["__REJECT_MESSAGE__"] = self.package_info() self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"] -- 2.39.5