Fix setting of sys.path when importing schema.py, fixes issue2550675,

thanks to Bryce L Nordgren for reporting.

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -19,6 +19,8 @@ Fixed:
   see doc/upgrading.txt for how to fix your trackers! (Ralf Schlatterbeck).
 - Some minor typos fixed in doc/customizing.txt (Thanks Ralf Hemmecke).
 - XML-RPC documentation now linked from the docs/index (Bernhard Reiter).
+- Fix setting of sys.path when importing schema.py, fixes issue2550675,
+  thanks to Bryce L Nordgren for reporting.
 
 2010-10-08 1.4.16 (r4541)
 

doc/acknowledgements.txt

@@ -94,6 +94,7 @@ Ramiro Morales,
 Toni Mueller,
 Stefan Niederhauser,
 Truls E. Næss,
+Bryce L Nordgren,
 Patrick Ohly,
 Luke Opperman,
 Eddie Parker,

roundup/instance.py

@@ -113,6 +113,9 @@ def open(self, name=None):
             'db': backend.Database(self.config, name)
         }
 
+        libdir = os.path.join(self.tracker_home, 'lib')
+        if os.path.isdir(libdir):
+            sys.path.insert(1, libdir)
         if self.optimize:
             # execute preloaded schema object
             exec(self.schema, vars)
@@ -121,9 +124,6 @@ def open(self, name=None):
             # use preloaded detectors
             detectors = self.detectors
         else:
-            libdir = os.path.join(self.tracker_home, 'lib')
-            if os.path.isdir(libdir):
-                sys.path.insert(1, libdir)
             # execute the schema file
             self._load_python('schema.py', vars)
             if callable (self.schema_hook):
@@ -132,8 +132,8 @@ def open(self, name=None):
             for extension in self.get_extensions('extensions'):
                 extension(self)
             detectors = self.get_extensions('detectors')
-            if libdir in sys.path:
-                sys.path.remove(libdir)
+        if libdir in sys.path:
+            sys.path.remove(libdir)
         db = vars['db']
         # apply the detectors
         for detector in detectors: