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_wininst.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_wininst.py')
| -rw-r--r-- | Lib/distutils/command/bdist_wininst.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 52e34ec..959a8bf 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -65,13 +65,15 @@ class bdist_wininst(Command): self.dist_dir = None self.bitmap = None self.title = None - self.skip_build = 0 + self.skip_build = None self.install_script = None self.pre_install_script = None self.user_access_control = None def finalize_options(self): + self.set_undefined_options('bdist', ('skip_build', 'skip_build')) + if self.bdist_dir is None: if self.skip_build and self.plat_name: # If build is skipped and plat_name is overridden, bdist will @@ -81,8 +83,10 @@ class bdist_wininst(Command): # next the command will be initialized using that name bdist_base = self.get_finalized_command('bdist').bdist_base self.bdist_dir = os.path.join(bdist_base, 'wininst') + if not self.target_version: self.target_version = "" + if not self.skip_build and self.distribution.has_ext_modules(): short_version = get_python_version() if self.target_version and self.target_version != short_version: |