Merge commit 'stew/content_generation' into merge

* commit 'stew/content_generation':
  Subst->subst
  import utils
  add import utils to top of database.py

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/database.py b/daklib/database.py
index c274a637a84fd54c0af32075056dce5e6341c930..3b5e9b5432d442e6d927248f234cd9a85f70fe8d 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -32,6 +32,7 @@
 import sys
 import time
 import types
+import utils
 
 ################################################################################
 
@@ -832,7 +833,7 @@ def copy_temporary_contents(package, version, deb):
             "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
             "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
 
-        message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents")
+        message = utils.TemplateSubst(subst, Cnf["Dir::Templates"]+"/missing-contents")
         utils.send_mail( message )
 
         exists = DBConn().insert_content_path(package, version, deb)