X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=7ff9a0f34bef9ae21bd5aa9953d5f8ede986d461;hb=9cf0783e39649ce2010c1f3fb2ebb6a9f5ab7f65;hp=3a9f2ef2e226a828bacb4331af8dc2663c6033b1;hpb=a43c7b22d8bbbcba586137b2345459d1e693f593;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 3a9f2ef2..7ff9a0f3 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -59,6 +59,7 @@ from daklib.dak_exceptions import *
 from daklib.regexes import re_default_answer
 from daklib.summarystats import SummaryStats
 from daklib.holding import Holding
+from daklib.config import Config
 
 from types import *
 
@@ -90,7 +91,7 @@ def init():
               "override-distribution", "version", "directory"]:
         cnf["Dinstall::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(cnf, Arguments, sys.argv)
+    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
     Options = cnf.SubTree("Dinstall::Options")
 
     if Options["Help"]:
@@ -243,6 +244,7 @@ def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, a
     # Send accept mail, announce to lists and close bugs
     if announce and not cnf["Dinstall::Options::No-Mail"]:
         template = os.path.join(cnf["Dir::Templates"], announce)
+        u.update_subst()
         u.Subst["__SUITE__"] = ""
         mail_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(mail_message)
@@ -434,6 +436,7 @@ def process_it(changes_file):
     cnf = Config()
 
     u = Upload()
+    u.pkg.changes_file = changes_file
 
     # Some defaults in case we can't fully process the .changes file
     u.pkg.changes["maintainer2047"] = cnf["Dinstall::MyEmailAddress"]