[Xen-changelog] [xen-unstable] xend: Fix c/s 20137 -- do not redefine built-in name 'str'.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1251739046 -3600
# Node ID b4fcb5f632dc1eddec9dc7437abc665a59dfb5b5
# Parent  3b7cbf32fee909d860daacf70b8c3b97eaf036b5
xend: Fix c/s 20137 -- do not redefine built-in name 'str'.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 3b7cbf32fee9 -r b4fcb5f632dc tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Mon Aug 31 10:54:32 2009 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Aug 31 18:17:26 2009 +0100
@@ -2411,10 +2411,10 @@ class XendDomainInfo:
             log.exception(e)
 
         if not self.domid or self.domid < 0:
-            str = 'Creating domain failed: name=%s' % self.info['name_label']
+            failmsg = 'Creating domain failed: name=%s' % 
self.info['name_label']
             if self.domid:
-                str += ', error=%i' % int(self.domid)
-            raise VmError(str)
+                failmsg += ', error=%i' % int(self.domid)
+            raise VmError(failmsg)
 
         self.dompath = GetDomainPath(self.domid)
 

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