From 93de0c02b63e2eb954a00d4e8b481b5df0560dfb Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Mon, 23 Sep 2013 22:16:49 -0400 Subject: [PATCH] Don't error out when we lose the race between listInfoDict and infoDict after requesting a machine deletion --- code/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/main.py b/code/main.py index b712696..86da50e 100755 --- a/code/main.py +++ b/code/main.py @@ -594,7 +594,11 @@ def modifyDict(username, state, machine_id, fields): def infoDict(username, state, machine): """Get the variables used by info.tmpl.""" - status = controls.statusInfo(machine) + try: + status = controls.statusInfo(machine) + except CodeError, e: + # machine was shut down in between the call to listInfoDict and this + status = None has_vnc = hasVnc(status) if status is None: main_status = dict(name=machine.name, -- 1.7.9.5