Use contact address from config on error page

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2694

diff --git a/code/main.py b/code/main.py
index 732b7a2..de0a739 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -76,7 +76,7 @@ class InvirtWeb(View):
         traceback = cherrypy.request.prev.params["traceback"]
         d = dict(op = op, user=username, fields=cherrypy.request.prev.params,
                  errorMessage=str(err), stderr=emsg, traceback=traceback)
-        error_raw = cherrypy.tools.mako.callable.get_lookup(**cherrypy.tools.mako._merged_args()).get_template("/error_raw.mako")
+        error_raw = cherrypy.request.lookup.get_template("/error_raw.mako")
         details = error_raw.render(**d)
         exclude = config.web.errormail_exclude
         if username not in exclude and '*' not in exclude:

diff --git a/code/templates/error.mako b/code/templates/error.mako
index 51c6a65..1edb1b4 100644 (file)
--- a/code/templates/error.mako
+++ b/code/templates/error.mako
@@ -8,7 +8,7 @@ ERROR!
 <p>Uh-oh!  We experienced an error.  Sorry about that.  We've gotten
 mail about it.</p>
 
-<p>Feel free to poke us at <tt>xvm@mit.edu</tt> if this bug is
+<p>Feel free to poke us at <tt>${config.contact}</tt> if this bug is
 consistently biting you and we don't seem to be fixing it.</p>
 
 <p>In case you're curious, the gory details are below.</p>