Changeset 261 for trunk/web/controls.py
- Timestamp:
- Jan 24, 2008, 9:34:53 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web/controls.py
r256 r261 75 75 """ 76 76 if cdtype is not None: 77 remctl('control', machine.name, 'create',78 cdtype)77 out, err = remctl('control', machine.name, 'create', 78 cdtype, err=True) 79 79 else: 80 remctl('control', machine.name, 'create') 80 out, err = remctl('control', machine.name, 'create', 81 err=True) 82 if 'already exists' in out: 83 raise InvalidInput('action', 'create', 84 'VM %s is already on' % machine.name) 85 elif err: 86 raise CodeError('"%s" on "control %s create %s' 87 % (err, machine.name, cdtype)) 88 else: 89 raise CodeError('"%s" on "control %s create %s' 90 % (err, machine.name, cdtype)) 81 91 82 92 def registerMachine(machine): … … 215 225 def commandResult(user, fields): 216 226 start_time = 0 217 print >> sys.stderr, time.time()-start_time218 227 machine = validation.testMachineId(user, fields.getfirst('machine_id')) 219 228 action = fields.getfirst('action') 220 229 cdrom = fields.getfirst('cdrom') 221 print >> sys.stderr, time.time()-start_time222 230 if cdrom is not None and not CDROM.get(cdrom): 223 231 raise CodeError("Invalid cdrom type '%s'" % cdrom) … … 269 277 elif action == 'Delete VM': 270 278 deleteVM(machine) 271 print >> sys.stderr, time.time()-start_time272 279 273 280 d = dict(user=user,
Note: See TracChangeset
for help on using the changeset viewer.