From: Alastair Tse <atse@xensource.com>
Date: Fri, 3 Nov 2006 16:51:28 +0000 (+0000)
Subject: [XEND] Fix xen_version and missing os import
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=14267ebb9a0a92c143ada866d56532a22a228249;p=xen.git

[XEND] Fix xen_version and missing os import

Signed-off-by: Alastair Tse <atse@xensource.com>
---

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index ec0f8e8c2f..2a3d2d30b3 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -29,6 +29,7 @@ import time
 import threading
 import re
 import copy
+import os
 from types import StringTypes
 
 import xen.lowlevel.xc
diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index 88f440fe74..d0548a4dee 100644
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -80,9 +80,13 @@ class XendNode:
 
     def xen_version(self):
         info = self.xc.xeninfo()
-        from xen import VERSION
-        return {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
-                'Xend': VERSION}
+        try:
+            from xen import VERSION
+            return {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
+                    'Xend': VERSION}
+        except (ImportError, AttributeError):
+            return {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
+                    'Xend': '3.0.3'}
 
     def get_name(self):
         return self.name