diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:01:45 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:01:45 (GMT) |
| commit | ff29ff88314badd8ba868de8cce5684d0f4611a4 (patch) | |
| tree | 86a3a22d6b1ab01d3a0d9d6de7100c82e1cbc327 /Lib/distutils/command/bdist_msi.py | |
| parent | 5e48c78ecfca75199b250a5d31577ef0f89db800 (diff) | |
| parent | fbe37dfffe501973b1e998bca948748097857179 (diff) | |
| download | cpython-ff29ff88314badd8ba868de8cce5684d0f4611a4.zip cpython-ff29ff88314badd8ba868de8cce5684d0f4611a4.tar.gz cpython-ff29ff88314badd8ba868de8cce5684d0f4611a4.tar.bz2 | |
Merge fix for #10946 from 3.2
Diffstat (limited to 'Lib/distutils/command/bdist_msi.py')
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 6 |
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()\ |