From: Mike O'Connor <stew@vireo.org>
Date: Sun, 22 Feb 2009 15:04:49 +0000 (-0500)
Subject: stupid bad merge syntax error
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7de18480f8a0da2b977077e01bab9176c343676f;p=dak.git

stupid bad merge syntax error

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

diff --git a/daklib/database.py b/daklib/database.py
index 3b6ded05..c274a637 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -829,9 +829,8 @@ def copy_temporary_contents(package, version, deb):
         subst = {
             "__PACKAGE__": package,
             "__VERSION__": version,
-            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress",
-            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"]
-            }
+            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
+            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
 
         message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents")
         utils.send_mail( message )