From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 24 May 2009 19:10:52 +0000 (+0000)
Subject: Issue #6065: Do not try to build a version-independent
X-Git-Tag: v2.7a1~1110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b578eba14d377e75ebe7cfd93a644f7ac42057;p=thirdparty%2FPython%2Fcpython.git

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

Also add NEWS entry for #5311.
---

diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index 4272b818bde7..b42e41b373ce 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 2a4d8378618f..a21651b161d8 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).