From: Adam Glasgall <adam@crossproduct.net>
Date: Tue, 24 Sep 2013 02:16:49 +0000 (-0400)
Subject: Don't error out when we lose the race between listInfoDict and infoDict after request... 
X-Git-Tag: 0.1.42~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/93de0c02b63e2eb954a00d4e8b481b5df0560dfb

Don't error out when we lose the race between listInfoDict and infoDict after requesting a machine 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,