diff options
author | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:42:50 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:42:50 (GMT) |
commit | b9fe54cccc3798f089489ef1e7f9026a35d16d6b (patch) | |
tree | e28f0aa1563038ff6cc0678cc3f327503623d540 /Lib/packaging/command/bdist_msi.py | |
parent | 83ab3f319b3b83c84c4df72349b6ce7d5ec936da (diff) | |
download | cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.zip cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.tar.gz cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.tar.bz2 |
Make bdist_* commands respect --skip-build passed to bdist (#10946).
There was already a test for this, but it was complicated and had a
subtle bug (custom command objects need to be put in dist.command_obj so
that other command objects may see them) that rendered it moot.
Diffstat (limited to 'Lib/packaging/command/bdist_msi.py')
-rw-r--r-- | Lib/packaging/command/bdist_msi.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/packaging/command/bdist_msi.py b/Lib/packaging/command/bdist_msi.py index 493f8b3..eaeb458 100644 --- a/Lib/packaging/command/bdist_msi.py +++ b/Lib/packaging/command/bdist_msi.py @@ -139,18 +139,22 @@ class bdist_msi(Command): self.no_target_optimize = False self.target_version = None self.dist_dir = None - self.skip_build = False + 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') + 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()\ |