[Python-checkins] r53184 - sandbox/branches/setuptools-0.6/setuptools/command/__init__.py sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py

[phillip.eby]

Author: phillip.eby
Date: Fri Dec 29 01:59:37 2006
New Revision: 53184

Modified:
   sandbox/branches/setuptools-0.6/setuptools/command/__init__.py
   sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py
Log:
Work around a distutils bdist_wininst bug: if the user has specified an
--install-lib via a configuration file, the path is hardcoded into the
.exe file in place of PLATLIB/ or PURELIB/.  (Backport from trunk.)


Modified: sandbox/branches/setuptools-0.6/setuptools/command/__init__.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/__init__.py	Fri Dec 29 01:59:37 2006
@@ -9,7 +9,6 @@
 if sys.version>='2.5':
     # In Python 2.5 and above, distutils includes its own upload command
     __all__.remove('upload')
-    __all__.remove('bdist_wininst')  # this is only for 'upload' support
 
 from distutils.command.bdist import bdist
 

Modified: sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py	Fri Dec 29 01:59:37 2006
@@ -20,3 +20,11 @@
         getattr(self.distribution,'dist_files',[]).append(
             ('bdist_wininst', pyversion, installer_name)
         )
+
+    def reinitialize_command (self, command, reinit_subcommands=0):
+        cmd = self.distribution.reinitialize_command(
+            command, reinit_subcommands)
+        if command in ('install', 'install_lib'):
+            cmd.install_lib = None  # work around distutils bug
+        return cmd
+