diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-03 17:40:22 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-03 17:40:22 +0000 |
| commit | ad709c500b91259d8557fcb8232dac7629756b75 (patch) | |
| tree | 39273253c1a5ec2947949abc944048daf87261e8 | |
| parent | b104c3762dcbe310318a14bed35f0813db48a26d (diff) | |
| download | xen-ad709c500b91259d8557fcb8232dac7629756b75.tar.gz xen-ad709c500b91259d8557fcb8232dac7629756b75.tar.bz2 xen-ad709c500b91259d8557fcb8232dac7629756b75.zip | |
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>
| -rw-r--r-- | tools/python/xen/xm/xenapi_create.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py index e56be76393..f53a1770fd 100644 --- a/tools/python/xen/xm/xenapi_create.py +++ b/tools/python/xen/xm/xenapi_create.py @@ -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) |