Index: package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2703)
+++ package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2704)
@@ -68,5 +68,4 @@
     @cherrypy.tools.mako(filename="/error.mako")
     def error(self):
-        #op, username, fields, err, emsg, traceback):
         """Print an error page when an exception occurs"""
         op = cherrypy.request.prev.path_info
@@ -75,5 +74,5 @@
         emsg = cherrypy.request.prev.params["emsg"]
         traceback = cherrypy.request.prev.params["traceback"]
-        d = dict(op = op, user=username, fields=cherrypy.request.prev.params,
+        d = dict(op=op, user=username, fields=cherrypy.request.prev.params,
                  errorMessage=str(err), stderr=emsg, traceback=traceback)
         error_raw = cherrypy.request.lookup.get_template("/error_raw.mako")