X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/7ab93691b4b6a45e99f78b37796413c5f24629a4..b001dd5804c18377b497d87ddf23138282ef2690:/code/main.py?ds=sidebyside diff --git a/code/main.py b/code/main.py index 8506ee5..bb863c1 100755 --- a/code/main.py +++ b/code/main.py @@ -39,8 +39,8 @@ import cache_acls from webcommon import InvalidInput, CodeError, State import controls from getafsgroups import getAfsGroupMembers -import sipb_xen_database as database -from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall +from invirt import database +from invirt.database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall from invirt.config import structs as config def pathSplit(path): @@ -85,6 +85,7 @@ def makeErrorPre(old, addition): return '
STDERR:
' + str(addition) + '' Template.database = database +Template.config = config Template.helppopup = staticmethod(helppopup) Template.err = None