ia64/xen-unstable

changeset 16717:b64be2bc7a91

xend: Remove hardcoded (and apparently unused) xend version.
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 15 14:24:05 2008 +0000 (2008-01-15)
parents e6e165f72e57
children 58dfcad8d56d
files tools/python/xen/xend/XendNode.py tools/python/xen/xend/server/SrvDaemon.py
line diff
     1.1 --- a/tools/python/xen/xend/XendNode.py	Tue Jan 15 14:22:50 2008 +0000
     1.2 +++ b/tools/python/xen/xend/XendNode.py	Tue Jan 15 14:24:05 2008 +0000
     1.3 @@ -377,13 +377,7 @@ class XendNode:
     1.4      def xen_version(self):
     1.5          info = self.xc.xeninfo()
     1.6  
     1.7 -        try:
     1.8 -            from xen import VERSION
     1.9 -            info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
    1.10 -                    'Xend': VERSION}
    1.11 -        except (ImportError, AttributeError):
    1.12 -            info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
    1.13 -                    'Xend': '3.0.3'}
    1.14 +        info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info}
    1.15  
    1.16          # Add xend_config_format
    1.17          info.update(self.xendinfo_dict())
     2.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Tue Jan 15 14:22:50 2008 +0000
     2.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Tue Jan 15 14:24:05 2008 +0000
     2.3 @@ -335,12 +335,6 @@ class Daemon:
     2.4              log.info("Xend changeset: %s.", xinfo['xen_changeset'])
     2.5              del xc
     2.6  
     2.7 -            try:
     2.8 -                from xen import VERSION
     2.9 -                log.info("Xend version: %s", VERSION)
    2.10 -            except ImportError:
    2.11 -                log.info("Xend version: Unknown.")
    2.12 -
    2.13              relocate.listenRelocation()
    2.14              servers = SrvServer.create()
    2.15              servers.start(status)