mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Fix domain exit actions that contain hyphen
Domain exit actions that contain a hyphen (e.g. rename-restart) were not being detected properly when xm is configured to use xenapi. Domain config containing on_crash=3D"rename-restart" results in xen53:~ # xm new /tmp/domU.config Using config file "/tmp/domU.config". Unexpected error: <type 'exceptions.TypeError'> This patch fixes the raised exception and at the same time handles the replacement of hyphen with underscore properly. Signed-off-by: Jim Fehlig <jfehlig@novell.com>
This commit is contained in:
1 parent
b104c3762d
commit
ad709c500b
1 file changed
+4
-4
@@ -664,11 +664,11 @@ class sxp2xml:
|
||||
= get_child_by_name(config, "on_crash", "restart")
|
||||
|
||||
def conv_chk(val, vals):
|
||||
val.replace("-", "_")
|
||||
if val not in vals:
|
||||
raise "Invalid value: " + val
|
||||
lval = val.replace("-", "_")
|
||||
if lval not in vals:
|
||||
raise ValueError("Invalid value: %s" % val)
|
||||
else:
|
||||
return val
|
||||
return lval
|
||||
|
||||
actions_after_shutdown = conv_chk(actions_after_shutdown,\
|
||||
XEN_API_ON_NORMAL_EXIT)
|
||||
|
||||