diff options
author | Keir Fraser <keir@xensource.com> | 2007-07-01 22:25:27 +0100 |
---|---|---|
committer | Keir Fraser <keir@xensource.com> | 2007-07-01 22:25:27 +0100 |
commit | 0cf4932910783de7126b89a4c9c6e0712ff37291 (patch) | |
tree | 0395df6da0b941da3738317207a3f0698c38e853 /tools | |
parent | e0ccefb2fb2329d2f18f8a51c5b1b195564c6761 (diff) | |
download | xen-0cf4932910783de7126b89a4c9c6e0712ff37291.tar.gz xen-0cf4932910783de7126b89a4c9c6e0712ff37291.tar.bz2 xen-0cf4932910783de7126b89a4c9c6e0712ff37291.zip |
xm: Fix xm block-detach error message duplication.
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/xen/xm/main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 17da145843..8bc0efe90a 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -2168,9 +2168,7 @@ def xm_network_attach(args): server.xend.domain.device_create(dom, vif) -def detach(args, command, deviceClass): - arg_check(args, command, 2, 3) - +def detach(args, deviceClass): dom = args[0] dev = args[1] try: @@ -2204,12 +2202,13 @@ def xm_block_detach(args): raise OptionError("Cannot find device '%s' in domain '%s'" % (dev,dom)) else: + arg_check(args, 'block-detach', 2, 3) try: - detach(args, 'block-detach', 'vbd') + detach(args, 'vbd') return except: pass - detach(args, 'block-detach', 'tap') + detach(args, 'tap') def xm_network_detach(args): if serverType == SERVER_XEN_API: @@ -2227,7 +2226,8 @@ def xm_network_detach(args): else: print "Cannot find device '%s' in domain '%s'" % (devid,dom) else: - detach(args, 'network-detach', 'vif') + arg_check(args, 'network-detach', 2, 3) + detach(args, 'vif') def xm_vnet_list(args): |