From: Greg Price <price@mit.edu>
Date: Mon, 21 Jul 2008 19:51:44 +0000 (-0400)
Subject: fix same error as r692 in two more places
X-Git-Tag: sipb-xen-www/3.6~9
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/9f1b11fe7e9983a386990be531879cb5727457b5

fix same error as r692 in two more places

svn path=/trunk/packages/sipb-xen-www/; revision=694
---

diff --git a/code/controls.py b/code/controls.py
index cd2d926..9c43a41 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -259,7 +259,7 @@ def commandResult(username, state, fields):
     elif action == 'Power off':
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):
                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:
@@ -269,7 +269,7 @@ def commandResult(username, state, fields):
     elif action == 'Shutdown':
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):
                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else: