Index: package_branches/invirt-web/cherrypy/code/Makefile =================================================================== --- package_branches/invirt-web/cherrypy/code/Makefile (revision 2485) +++ package_branches/invirt-web/cherrypy/code/Makefile (revision 2486) @@ -1,5 +1,3 @@ -DIRS = templates - -all: kill chmod compile +all: kill chmod chmod: @@ -9,12 +7,2 @@ 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 Index: package_branches/invirt-web/cherrypy/code/main.py =================================================================== --- package_branches/invirt-web/cherrypy/code/main.py (revision 2485) +++ package_branches/invirt-web/cherrypy/code/main.py (revision 2486) @@ -82,5 +82,5 @@ 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 Index: package_branches/invirt-web/cherrypy/code/templates/Makefile =================================================================== --- package_branches/invirt-web/cherrypy/code/templates/Makefile (revision 2485) +++ (revision ) @@ -1,13 +1,0 @@ -TEMPLATES=$(wildcard *.tmpl) -OUTPUTS=$(TEMPLATES:.tmpl=.py) - -all: ${OUTPUTS} - -%.py: %.tmpl - cheetah compile $< - -#${OUTPUTS}:${TEMPLATES} -# cheetah compile $^ - -clean: - @rm -f ${OUTPUTS} *.pyo *.pyc *.py.bak Index: package_branches/invirt-web/cherrypy/code/templates/__init__.py =================================================================== --- package_branches/invirt-web/cherrypy/code/templates/__init__.py (revision 2485) +++ (revision ) @@ -1,9 +1,0 @@ -__all__ = 'info command error error_raw help invalid list unauth vnc'.split() -for _name in __all__: - try: - _module = __import__(_name, globals(), {}, [_name]) - globals()[_name] = getattr(_module, _name) - except ImportError, e: - import sys - print >> sys.stderr, 'Importing template "%s" raised error: %s' % (_name, e) - Index: package_branches/invirt-web/cherrypy/code/templates/create.tmpl =================================================================== --- package_branches/invirt-web/cherrypy/code/templates/create.tmpl (revision 2485) +++ (revision ) @@ -1,15 +1,0 @@ -#from skeleton import skeleton -#extends skeleton - -#def title -Created! -#end def - -#def body -#if $machine -
Congratulations! You have a new machine named ${machine.name}.
-#else -Odd... no error, but no machine.
-#end if - -#end def Index: package_branches/invirt-web/cherrypy/code/templates/error.mako =================================================================== --- package_branches/invirt-web/cherrypy/code/templates/error.mako (revision 2485) +++ package_branches/invirt-web/cherrypy/code/templates/error.mako (revision 2486) @@ -9,5 +9,5 @@ mail about it. -Feel free to poke us at xvm@mit.edu if this bug is +
Feel free to poke us at ${config.contact} if this bug is consistently biting you and we don't seem to be fixing it.