projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment out timing info
[invirt/packages/invirt-web.git]
/
code
/
main.py
diff --git
a/code/main.py
b/code/main.py
index
ebbd7dd
..
d17ed97
100755
(executable)
--- a/
code/main.py
+++ b/
code/main.py
@@
-448,7
+448,7
@@
The administrator field determines who can access the console and
power on and off the machine. This can be either a user or a moira
group.""",
quotas="""
power on and off the machine. This can be either a user or a moira
group.""",
quotas="""
-Quotas are determined on a per-locker basis. Each quota may have a
+Quotas are determined on a per-locker basis. Each locker may have a
maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4
active machines.""",
console="""
maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4
active machines.""",
console="""
@@
-613,7
+613,7
@@
def main(operation, user, fields):
output_string = str(output)
checkpoint.checkpoint('output as a string')
print output_string
output_string = str(output)
checkpoint.checkpoint('output as a string')
print output_string
- print '<pre>%s</pre>' % checkpoint
+ print '<!-- <pre>%s</pre> -->' % checkpoint
except Exception, err:
if not fields.has_key('js'):
if isinstance(err, CodeError):
except Exception, err:
if not fields.has_key('js'):
if isinstance(err, CodeError):