aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-11-08 15:32:14 +0000
committerKeir Fraser <keir@xensource.com>2007-11-08 15:32:14 +0000
commit5ac841d232025ab129b662fc4137de8fc4c2f385 (patch)
treeeae587b41dbe08c855c06f179aa20d138c92500b /tools
parent86c60bb2d57197738bea0e016cb82eef026776eb (diff)
downloadxen-5ac841d232025ab129b662fc4137de8fc4c2f385.tar.gz
xen-5ac841d232025ab129b662fc4137de8fc4c2f385.tar.bz2
xen-5ac841d232025ab129b662fc4137de8fc4c2f385.zip
xend: Allow for non-existent xen-python-path binary.
On Solaris, xen-python-path is unnecessary. Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/misc/xend13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/misc/xend b/tools/misc/xend
index 1bddf0a776..dcb600d6a2 100644
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -33,13 +33,14 @@ import signal
import time
import commands
-result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
- 'xen-python-path'))
-if result[0] != 0:
- print >>sys.stderr, result[1]
- sys.exit(1)
+xpp = os.path.join(os.path.dirname(sys.argv[0], 'xen-python-path'))
+if os.path.exists(xpp):
+ result = commands.getstatusoutput(xpp)
+ if result[0] != 0:
+ print >>sys.stderr, result[1]
+ sys.exit(1)
-sys.path.append(result[1])
+ sys.path.append(result[1])
from xen.xend.server import SrvDaemon