summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-05-24 19:10:52 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-05-24 19:10:52 (GMT)
commit53b578eba14d377e75ebe7cfd93a644f7ac42057 (patch)
treedeb9d1ef413ddd1c9af240ecc5af9d8017c9a656
parentd03e1b4475a0aaf4c7969ba7cec77e6a71161a3c (diff)
downloadcpython-53b578eba14d377e75ebe7cfd93a644f7ac42057.zip
cpython-53b578eba14d377e75ebe7cfd93a644f7ac42057.tar.gz
cpython-53b578eba14d377e75ebe7cfd93a644f7ac42057.tar.bz2
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 4272b81..b42e41b 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 2a4d837..a21651b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -302,6 +302,9 @@ Core and Builtins
Library
-------
+- Issue #5311: bdist_msi can now build packages that do not depend on a
+ specific Python version.
+
- Issue #1309352: fcntl now converts its third arguments to a C `long` rather
than an int, which makes some operations possible under 64-bit Linux (e.g.
DN_MULTISHOT with F_NOTIFY).