stupid bad merge syntax error

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

stupid bad merge syntax error
Signed-off-by: N Mike O'Connor <stew@vireo.org>
7de18480 · Mike O'Connor · b373c111 · 7de18480
隐藏空白更改
内联并排

Showing with 2 addition and 3 deletion

daklib/database.py daklib/database.py +2 -3

未找到文件。
--- 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 )