--- xen-3.0.3-testing-11633/tools/python/xen/xm/opts.py.orig	2006-09-28 18:52:39.000000000 -0400
+++ xen-3.0.3-testing-11633/tools/python/xen/xm/opts.py	2006-10-20 16:59:35.000000000 -0400
@@ -483,11 +483,8 @@ class Opts:
         'path'    search path
         'defconfig' script name
         """
-        for x in [ '' ] + self.vals.path.split(':'):
-            if x:
-                p = os.path.join(x, self.vals.defconfig)
-            else:
-                p = self.vals.defconfig
+        for x in [ os.path.curdir ] + self.vals.path.split(':'):
+            p = os.path.join(x, self.vals.defconfig)
             if os.path.exists(p):
                 self.info('Using config file "%s".' % p)
                 self.load(p, help)
@@ -518,6 +515,10 @@ class Opts:
         exec cmd in globs, locs
         try:
             execfile(defconfig, globs, locs)
+        except SyntaxError,e:
+                raise SyntaxError, \
+                "Errors were found at line %d while processing %s:\n\t%s"\
+                %(e.lineno,defconfig,e.text)
         except:
             if not help: raise
         if help: