[Xen-changelog] [xen-unstable] merge

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 9b6c901b9de5e2f924045207a9e042b12477840d
# Parent  89f7faa0c01a507365b4040d4b10b85d95c3acc0
# Parent  ccbc5319d0301d9692d63e23af5f4f2702acb6b9
merge
---
 tools/pygrub/README                       |    2 +-
 tools/python/xen/xend/XendLogging.py      |    2 +-
 tools/python/xen/xend/server/SrvDaemon.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 89f7faa0c01a -r 9b6c901b9de5 tools/pygrub/README
--- a/tools/pygrub/README       Fri Jul 14 11:54:10 2006 +0100
+++ b/tools/pygrub/README       Fri Jul 14 11:55:34 2006 +0100
@@ -11,5 +11,5 @@ 2) Libraries of reiserfs, which is the f
 2) Libraries of reiserfs, which is the following package (depend on your Linux 
distribution):
        - libreiserfs-dev on Debian based distributions (Debian, Ubuntu, 
Xandros, Libranet, Xandros, etc...)
        - progsreiserfs-devel on RedHat
-       - progreiserfs on Gentoo
+       - progsreiserfs on Gentoo
 
diff -r 89f7faa0c01a -r 9b6c901b9de5 tools/python/xen/xend/XendLogging.py
--- a/tools/python/xen/xend/XendLogging.py      Fri Jul 14 11:54:10 2006 +0100
+++ b/tools/python/xen/xend/XendLogging.py      Fri Jul 14 11:55:34 2006 +0100
@@ -28,7 +28,7 @@ __all__ = [ 'log', 'init', 'getLogFilena
 __all__ = [ 'log', 'init', 'getLogFilename' ]
 
 
-if not 'TRACE' in logging.__dict__:
+if 'TRACE' not in logging.__dict__:
     logging.TRACE = logging.DEBUG - 1
     logging.addLevelName(logging.TRACE,'TRACE')
     def trace(self, *args, **kwargs):
diff -r 89f7faa0c01a -r 9b6c901b9de5 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Fri Jul 14 11:54:10 2006 +0100
+++ b/tools/python/xen/xend/server/SrvDaemon.py Fri Jul 14 11:55:34 2006 +0100
@@ -136,7 +136,7 @@ class Daemon:
         if not XEND_DAEMONIZE:
             self.tracing(trace)
             self.run(None)
-            return ret;
+            return ret
         
         # we use a pipe to communicate between the parent and the child process
         # this way we know when the child has actually initialized itself so

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