X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/88448d9221a686ce71cb0f465888d84a1a6ece19..4c41516ba6b19e3fa3423d489e98fcdf6088e365:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index 5c856e3..4b9c6a4 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -43,6 +43,8 @@ def getswap(disksize, memsize):
     return int(min(disksize / 4, memsize * 1.5))
 
 def lvinstall(machine, autoinstall):
+    #raise InvalidInput('autoinstall', 'install',
+    #                   "The autoinstaller has been temporarily disabled")
     disksize = machine.disks[0].size
     memsize = machine.memory
     swapsize = getswap(disksize, memsize)
@@ -173,7 +175,7 @@ def listHost(machine):
 
 def vnctoken(machine):
     """Return a time-stamped VNC token"""
-    out, err = remctl('control', machine.name, 'vnctoken')
+    out, err = remctl('control', machine.name, 'vnctoken', err=True)
     if err:
         return None
     return out.strip()