Changeset 170

Timestamp:

12/08/06 17:19:17 (4 years ago)

Author:

lazaridis_com

Message:

re #105 and 106, corrected loader, removde generation of egg_infos from within code.

Files:

• infra/tracx/tracx/loader.py (modified) (2 diffs)

infra/tracx/tracx/loader.py

@@ -10 +10 @@
 import os.path
 import os
+import sys
        
 #------------------------------------------------------------------------------
@@ -42 +43 @@
                 subdirs.append(fullname)
         
-        # create the egg-info for each subdir
-        curdir = os.getcwd()
+        # create a list of setup.py containing folders
+        setupdirs = []
         for dir in subdirs:
-            os.chdir(dir)
-            if os.path.exists( os.path.join(dir,'setup.py')):
-                import sys                
-                #TODO: pass argv in the global dict of the execfile function
-                sys.argv = ["setup.py", "egg_info"]
-                execfile( os.path.join(dir,'setup.py'))
-                self.log.debug(dir)
+            if os.path.exists(os.path.join(dir,'setup.py')):
+                setupdirs.append(dir)
+                sys.path.append(dir )
+                self.log.debug("setupdir %s", dir)
 
-        os.chdir(curdir)
-        
         # call plugin loader      
 #TODO: trac:#4317 - replace next line with below after fixing
         from tracx.modified.loader import load_components
-        #trac.loader import load_components
+        #from trac.loader import load_components
 #        
-        load_components(self.env, subdirs)
+        load_components(self.env, setupdirs)       
         
 #TODO trac:$4190 - replace dummies to force component initialization