mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 72891 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72891 | martin.v.loewis | 2009-05-24 21:10:52 +0200 (So, 24 Mai 2009) | 5 lines

  Issue #6065: Do not try to build a version-independent
  installer if the package has extension modules.

  Also add NEWS entry for #5311.
........
This commit is contained in:
Martin v. Löwis 2009-05-24 19:19:17 +00:00
parent 61f77b57fd
commit 403117aa60
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/command/bdist_msi.py
View file

@ -141,6 +141,8 @@ class bdist_msi(Command):
bdist_base = self.get_finalized_command('bdist').bdist_base bdist_base = self.get_finalized_command('bdist').bdist_base
self.bdist_dir = os.path.join(bdist_base, 'msi') self.bdist_dir = os.path.join(bdist_base, 'msi')
short_version = get_python_version() short_version = get_python_version()
if (not self.target_version) and self.distribution.has_ext_modules():
self.target_version = short_version
if self.target_version: if self.target_version:
self.versions = [self.target_version] self.versions = [self.target_version]
if not self.skip_build and self.distribution.has_ext_modules()\ if not self.skip_build and self.distribution.has_ext_modules()\

3
Misc/NEWS
View file

@ -230,6 +230,9 @@ Installation
Library Library
------- -------
- Issue #5311: bdist_msi can now build packages that do not depend on a
specific Python version.
- Issue #5940: distutils.command.build_clib.check_library_list was not doing - Issue #5940: distutils.command.build_clib.check_library_list was not doing
the right type checkings anymore. the right type checkings anymore.