From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jim Fehlig <jfehlig@novell.com>
Subject: [PATCH] [xend] Remove hardcoded version
Date: Fri, 11 Jan 2008 09:40:47 -0700
Message-ID: <47879C0F.5090003@novell.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010506090204080202060604"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------010506090204080202060604
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Remove hardcoded (and apparently unused by anyone) xend version.

   Signed-off-by: Jim Fehlig <jfehlig@novell.com>

Regards,
Jim



--------------010506090204080202060604
Content-Type: text/x-patch;
 name="xend_version.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="xend_version.diff"

diff -r 8922a1469284 tools/python/xen/xend/XendNode.py
--- a/tools/python/xen/xend/XendNode.py	Wed Jan 09 22:21:58 2008 +0000
+++ b/tools/python/xen/xend/XendNode.py	Fri Jan 11 09:44:57 2008 -0700
@@ -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 8922a1469284 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py	Wed Jan 09 22:21:58 2008 +0000
+++ b/tools/python/xen/xend/server/SrvDaemon.py	Fri Jan 11 09:44:57 2008 -0700
@@ -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)

--------------010506090204080202060604
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------010506090204080202060604--