Changeset 2486 for package_branches/invirt-web

Timestamp:

Sep 28, 2009, 8:40:28 PM (15 years ago)

Author:

quentin

Message:

error page tweaks

Location:

package_branches/invirt-web/cherrypy/code

Files:

• Makefile (modified) (2 diffs)
• main.py (modified) (1 diff)
• templates/Makefile (deleted)
• templates/__init__.py (deleted)
• templates/create.tmpl (deleted)
• templates/error.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy/code/Makefile

@@ -1 @@
-DIRS = templates
-
-all: kill chmod compile
+all: kill chmod
 
 chmod:
@@ -9 +7 @@
 kill:
         -pkill main.fcgi
-
-compile:
-        for dir in $(DIRS); do \
-                (cd $$dir; $(MAKE) all); \
-        done
-
-clean:
-        for dir in $(DIRS); do \
-                (cd $$dir; $(MAKE) clean); \
-        done

package_branches/invirt-web/cherrypy/code/main.py

@@ -82 +82 @@
         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

package_branches/invirt-web/cherrypy/code/templates/error.mako

@@ -9 +9 @@
 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>