[Python-checkins] r43201 - sandbox/trunk/setuptools/setuptools/command/bdist_egg.py

phillip.eby python-checkins at python.org
Tue Mar 21 20:04:56 CET 2006


Author: phillip.eby
Date: Tue Mar 21 20:04:55 2006
New Revision: 43201

Modified:
   sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
Log:
Don't generate a loader .py file in .egg file for extensions that aren't 
actually built.  This prevents problems w/customized setups that make 
some extensions optional (e.g. scipy.distutils).


Modified: sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	Tue Mar 21 20:04:55 2006
@@ -307,7 +307,8 @@
                 fullname = build_cmd.get_ext_fullname(ext.name)
                 filename = build_cmd.get_ext_filename(fullname)
                 if not os.path.basename(filename).startswith('dl-'):
-                    ext_outputs.append(filename)
+                    if os.path.exists(os.path.join(self.bdist_dir,filename)):
+                        ext_outputs.append(filename)
 
         return all_outputs, ext_outputs
 
@@ -325,7 +326,6 @@
 
 
 
-
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
     walker = os.walk(egg_dir)


More information about the Python-checkins mailing list