[Xen-changelog] [xen-unstable] xend: Allow for non-existent xen-python-path binary.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1194535934 0
# Node ID 0ebac857649591de0e1b57605b054552afb03297
# Parent  c0bdfda5183d5e9dca5c9bc7a68a6cf40e3f6c58
xend: Allow for non-existent xen-python-path binary.
On Solaris, xen-python-path is unnecessary.

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/misc/xend |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff -r c0bdfda5183d -r 0ebac8576495 tools/misc/xend
--- a/tools/misc/xend   Thu Nov 08 14:50:01 2007 +0000
+++ b/tools/misc/xend   Thu Nov 08 15:32:14 2007 +0000
@@ -33,13 +33,14 @@ import time
 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
 

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