]> git.decadent.org.uk Git - dak.git/commitdiff
stupid bad merge syntax error
authorMike O'Connor <stew@vireo.org>
Sun, 22 Feb 2009 15:04:49 +0000 (10:04 -0500)
committerMike O'Connor <stew@vireo.org>
Sun, 22 Feb 2009 15:04:49 +0000 (10:04 -0500)
Signed-off-by: Mike O'Connor <stew@vireo.org>
daklib/database.py

index 3b6ded05bdb56b728e41475b8a0215af9cd9cbae..c274a637a84fd54c0af32075056dce5e6341c930 100755 (executable)
@@ -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 )