summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-05-24 19:19:17 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-05-24 19:19:17 (GMT)
commit403117aa606438427aa9f9dc72271d40bc0ba0b2 (patch)
tree6a77557219730fa1fe06325e177e3dd8a041e28d
parent61f77b57fdfcc8a630667dda3cbb8c5ac502f438 (diff)
downloadcpython-403117aa606438427aa9f9dc72271d40bc0ba0b2.zip
cpython-403117aa606438427aa9f9dc72271d40bc0ba0b2.tar.gz
cpython-403117aa606438427aa9f9dc72271d40bc0ba0b2.tar.bz2
Merged revisions 72891 via svnmerge from
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. ........
-rw-r--r--Lib/distutils/command/bdist_msi.py2
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index 9645158..bca98cc 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -141,6 +141,8 @@ class bdist_msi(Command):
bdist_base = self.get_finalized_command('bdist').bdist_base
self.bdist_dir = os.path.join(bdist_base, 'msi')
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:
self.versions = [self.target_version]
if not self.skip_build and self.distribution.has_ext_modules()\
diff --git a/Misc/NEWS b/Misc/NEWS
index 110efbe..76f8773 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,9 @@ Installation
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
the right type checkings anymore.