summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command/bdist_msi.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-29 19:48:39 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-08-29 19:48:39 (GMT)
commitd5a9811dbe89e52e6c4d0bb389154afd72fabb13 (patch)
treebcf36e51adae46d62d5be1b2ec924b3050386c57 /Lib/distutils/command/bdist_msi.py
parentc3085aa77b123e8eb56e0f215d56ff11e3a99985 (diff)
downloadcpython-d5a9811dbe89e52e6c4d0bb389154afd72fabb13.zip
cpython-d5a9811dbe89e52e6c4d0bb389154afd72fabb13.tar.gz
cpython-d5a9811dbe89e52e6c4d0bb389154afd72fabb13.tar.bz2
Make bdist_* commands respect --skip-build passed to bdist (#10946)
Diffstat (limited to 'Lib/distutils/command/bdist_msi.py')
-rw-r--r--Lib/distutils/command/bdist_msi.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index b11957a..b3cfe9c 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -130,18 +130,22 @@ class bdist_msi(Command):
self.no_target_optimize = 0
self.target_version = None
self.dist_dir = None
- self.skip_build = 0
+ self.skip_build = None
self.install_script = None
self.pre_install_script = None
self.versions = None
def finalize_options(self):
+ self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
if self.bdist_dir is None:
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()\