Changeset 694

Timestamp:

Jul 21, 2008, 3:51:44 PM (16 years ago)

Author:

price

Message:

fix same error as r692 in two more places

File:

• trunk/packages/sipb-xen-www/code/controls.py (modified) (2 diffs)

trunk/packages/sipb-xen-www/code/controls.py

@@ -260 +260 @@
         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.")
@@ -270 +270 @@
         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.")