X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/4750a3526415132120713c6631007bb07700e028..9f1b11fe7e9983a386990be531879cb5727457b5:/code/controls.py?ds=inline

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: