[Xen-changelog] [xen-unstable] Tidy error message.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 56d93b6ea9eab9ea044acdbae647a569fe20def8
# Parent  4e3a7d82917cb33e5fede05cb0ed93a0fee70d7d
Tidy error message.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 4e3a7d82917c -r 56d93b6ea9ea tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Mon Dec 04 10:24:54 2006 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Dec 04 10:27:23 2006 +0000
@@ -1709,8 +1709,10 @@ class XendDomainInfo:
 
         dom =  XendDomain.instance().domain_lookup_nr(name)
         if dom and dom.info['uuid'] != self.info['uuid']:
-            raise VmError("VM name '%s' already exists as domain %s" %
-                          (name, str(dom.domid)))
+            raise VmError("VM name '%s' already exists%s" %
+                          (name,
+                           dom.domid is not None and
+                           ("as domain %s" % str(dom.domid)) or ""))
         
 
     def update(self, info = None, refresh = True):

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog