===== tools/misc/netfix 1.13 vs edited =====
--- 1.13/tools/misc/netfix	2005-01-12 04:36:09 -05:00
+++ edited/tools/misc/netfix	2005-04-15 16:30:34 -04:00
@@ -9,9 +9,12 @@
 
 from getopt import getopt
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
-from xen.util.Brctl import *
+# add fallback path for non-native python path installs if needed
+try:
+    from xen.util.Brctl import *
+except ImportError:
+    sys.path.append('/usr/lib/python')
+    from xen.util.Brctl import *    
 
 short_options = 'hvqni:b:c'
 long_options  = ['help', 'verbose', 'quiet',
===== tools/misc/xend 1.20 vs edited =====
--- 1.20/tools/misc/xend	2005-03-15 14:21:14 -05:00
+++ edited/tools/misc/xend	2005-04-15 16:30:04 -04:00
@@ -30,9 +30,12 @@
 XCS_PIDFILE = "/var/run/xcs.pid"
 XCS_ARGS    = (XCS_EXEC, "-p", XCS_PIDFILE)
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
-from xen.xend.server import SrvDaemon
+# add fallback path for non-native python path installs if needed
+try:
+    from xen.xend.server import SrvDaemon
+except ImportError:
+    sys.path.append('/usr/lib/python')
+    from xen.xend.server import SrvDaemon    
 
 class CheckError(ValueError):
     pass
===== tools/misc/xensv 1.4 vs edited =====
--- 1.4/tools/misc/xensv	2005-01-12 04:36:09 -05:00
+++ edited/tools/misc/xensv	2005-04-15 16:30:06 -04:00
@@ -22,9 +22,12 @@
 import sys
 import re
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
-from xen.xend.server.params import XEND_PID_FILE
+# add fallback path for non-native python path installs if needed
+try:
+    from xen.xend.server.params import XEND_PID_FILE
+except ImportError:
+    sys.path.append('/usr/lib/python')
+    from xen.xend.server.params import XEND_PID_FILE    
 
 class CheckError(ValueError):
     pass
===== tools/misc/xm 1.9 vs edited =====
--- 1.9/tools/misc/xm	2005-01-12 04:36:09 -05:00
+++ edited/tools/misc/xm	2005-04-15 16:30:58 -04:00
@@ -2,8 +2,11 @@
 #  -*- mode: python; -*-
 import sys
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
-from xen.xm import main
+# add fallback path for non-native python path installs if needed
+try:
+    from xen.xm import main
+except ImportError:
+    sys.path.append('/usr/lib/python')
+    from xen.xm import main    
 
 main.main(sys.argv)