Fix for http://bugs.python.org/setuptools/issue9 (backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4065955

2 files changed, 9 insertions, 9 deletions

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index bb1112c1..61fd6c3d 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -203,10 +203,12 @@ class bdist_egg(Command):
             log.info("installing scripts to %s" % script_dir)
             self.call_command('install_scripts',install_dir=script_dir,no_ep=1)
 
-        native_libs = os.path.join(self.egg_info,"native_libs.txt")
+        self.copy_metadata_to(egg_info)
+        native_libs = os.path.join(egg_info, "native_libs.txt")
         if all_outputs:
             log.info("writing %s" % native_libs)
             if not self.dry_run:
+                ensure_directory(native_libs)
                 libs_file = open(native_libs, 'wt')
                 libs_file.write('\n'.join(all_outputs))
                 libs_file.write('\n')
@@ -216,8 +218,6 @@ class bdist_egg(Command):
             if not self.dry_run:
                 os.unlink(native_libs)
 
-        self.copy_metadata_to(egg_info)
-
         write_safety_flag(
             os.path.join(archive_root,'EGG-INFO'), self.zip_safe()
         )
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 4e135d33..9741e26a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -168,6 +168,12 @@ class egg_info(Command):
         for ep in iter_entry_points('egg_info.writers'):
             writer = ep.load(installer=installer)
             writer(self, ep.name, os.path.join(self.egg_info,ep.name))
+
+        # Get rid of native_libs.txt if it was put there by older bdist_egg
+        nl = os.path.join(self.egg_info, "native_libs.txt")
+        if os.path.exists(nl):
+            self.delete_file(nl)
+
         self.find_sources()
 
     def tags(self):
@@ -197,12 +203,6 @@ class egg_info(Command):
 
 
 
-
-
-
-
-
-
     def get_svn_revision(self):
         revision = 0
         urlre = re.compile('url="([^"]+)"')