update to match current error messages

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

diff --git a/code/controls.py b/code/controls.py
index b946666..cd2d926 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -242,7 +242,7 @@ def commandResult(username, state, fields):
             out, err = remctl('control', machine.name, 'reboot',
                               err=True)
         if err:
             out, err = remctl('control', machine.name, 'reboot',
                               err=True)
         if err:

-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:
                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else: