ia64/xen-unstable

changeset 10759:9b6c901b9de5

merge
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 14 11:55:34 2006 +0100 (2006-07-14)
parents 89f7faa0c01a ccbc5319d030
children f35b9950843c
files
line diff
     1.1 --- a/tools/pygrub/README	Fri Jul 14 11:54:10 2006 +0100
     1.2 +++ b/tools/pygrub/README	Fri Jul 14 11:55:34 2006 +0100
     1.3 @@ -11,5 +11,5 @@ 1) Libraries of ext2fs, which is the fol
     1.4  2) Libraries of reiserfs, which is the following package (depend on your Linux distribution):
     1.5  	- libreiserfs-dev on Debian based distributions (Debian, Ubuntu, Xandros, Libranet, Xandros, etc...)
     1.6  	- progsreiserfs-devel on RedHat
     1.7 -	- progreiserfs on Gentoo
     1.8 +	- progsreiserfs on Gentoo
     1.9  
     2.1 --- a/tools/python/xen/xend/XendLogging.py	Fri Jul 14 11:54:10 2006 +0100
     2.2 +++ b/tools/python/xen/xend/XendLogging.py	Fri Jul 14 11:55:34 2006 +0100
     2.3 @@ -28,7 +28,7 @@ from xen.xend.server import params
     2.4  __all__ = [ 'log', 'init', 'getLogFilename' ]
     2.5  
     2.6  
     2.7 -if not 'TRACE' in logging.__dict__:
     2.8 +if 'TRACE' not in logging.__dict__:
     2.9      logging.TRACE = logging.DEBUG - 1
    2.10      logging.addLevelName(logging.TRACE,'TRACE')
    2.11      def trace(self, *args, **kwargs):
     3.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Fri Jul 14 11:54:10 2006 +0100
     3.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Fri Jul 14 11:55:34 2006 +0100
     3.3 @@ -136,7 +136,7 @@ class Daemon:
     3.4          if not XEND_DAEMONIZE:
     3.5              self.tracing(trace)
     3.6              self.run(None)
     3.7 -            return ret;
     3.8 +            return ret
     3.9          
    3.10          # we use a pipe to communicate between the parent and the child process
    3.11          # this way we know when the child has actually initialized itself so