diff options
author | Éric Araujo <merwok@netwok.org> | 2011-08-30 14:21:15 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-08-30 14:21:15 (GMT) |
commit | d15b768ddb68fe82470d26bb2cc36699f4bc0b75 (patch) | |
tree | 314bac1cdca839976e5de93505d7173add150826 /Lib/distutils/command/bdist_msi.py | |
parent | a514eb95f30306a11a14f8a3b9cbf229c6af6137 (diff) | |
parent | b9fe54cccc3798f089489ef1e7f9026a35d16d6b (diff) | |
download | cpython-d15b768ddb68fe82470d26bb2cc36699f4bc0b75.zip cpython-d15b768ddb68fe82470d26bb2cc36699f4bc0b75.tar.gz cpython-d15b768ddb68fe82470d26bb2cc36699f4bc0b75.tar.bz2 |
Branch merge
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()\ |