Second part of fix for bug [#483982] Python 2.2b2 bdist_wininst

crashes.

If no external zip-utility is found, the archive is created by the
zipfile module, which behaves different now than in 2.1: if the
zip-file is created in the root directory if the distribution, it will
contain an (empty) version of itself.

This triggered the above bug - so it's better to create the zip-file
far away in the TMP directory.

diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index 357ba519d31b6f3d1d75927f02850cdf758d9833..9ff946130714f75296b2ef557c59b8acea13f24e 100644 (file)
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -112,13 +112,16 @@ class bdist_wininst (Command):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
+        from tempfile import mktemp
+        archive_basename = mktemp()
         fullname = self.distribution.get_fullname()
-        archive_basename = os.path.join(self.bdist_dir,
-                                        "%s.win32" % fullname)
-
         arcname = self.make_archive(archive_basename, "zip",
                                     root_dir=self.bdist_dir)
+        # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
+        # remove the zip-file again
+        self.announce("removing temporary file '%s'" % arcname)
+        os.remove(arcname)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, self.verbose, self.dry_run)