43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1200407045 0
|
|
# Node ID b64be2bc7a91c004982b0ddba0c644744f944141
|
|
# Parent e6e165f72e571c12f671c6ad8a70acf8d8090852
|
|
xend: Remove hardcoded (and apparently unused) xend version.
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
|
|
|
diff -r e6e165f72e57 -r b64be2bc7a91 tools/python/xen/xend/XendNode.py
|
|
--- a/tools/python/xen/xend/XendNode.py Tue Jan 15 14:22:50 2008 +0000
|
|
+++ b/tools/python/xen/xend/XendNode.py Tue Jan 15 14:24:05 2008 +0000
|
|
@@ -377,13 +377,7 @@ class XendNode:
|
|
def xen_version(self):
|
|
info = self.xc.xeninfo()
|
|
|
|
- try:
|
|
- from xen import VERSION
|
|
- info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
|
|
- 'Xend': VERSION}
|
|
- except (ImportError, AttributeError):
|
|
- info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
|
|
- 'Xend': '3.0.3'}
|
|
+ info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info}
|
|
|
|
# Add xend_config_format
|
|
info.update(self.xendinfo_dict())
|
|
diff -r e6e165f72e57 -r b64be2bc7a91 tools/python/xen/xend/server/SrvDaemon.py
|
|
--- a/tools/python/xen/xend/server/SrvDaemon.py Tue Jan 15 14:22:50 2008 +0000
|
|
+++ b/tools/python/xen/xend/server/SrvDaemon.py Tue Jan 15 14:24:05 2008 +0000
|
|
@@ -335,12 +335,6 @@ class Daemon:
|
|
log.info("Xend changeset: %s.", xinfo['xen_changeset'])
|
|
del xc
|
|
|
|
- try:
|
|
- from xen import VERSION
|
|
- log.info("Xend version: %s", VERSION)
|
|
- except ImportError:
|
|
- log.info("Xend version: Unknown.")
|
|
-
|
|
relocate.listenRelocation()
|
|
servers = SrvServer.create()
|
|
servers.start(status)
|