diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2012-05-28 12:36:07 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2012-05-28 12:36:07 (GMT) |
| commit | ab45e689be9e954de37fcb18d584fa09a19111f3 (patch) | |
| tree | bb42429e480b163ed825b274e1ff439c3ca1a9f5 | |
| parent | 7e18f43ec8b163d1af99c7f9feea08185a567d01 (diff) | |
| parent | 4b6045c30fb47a89cd32ebedc2b8d2603cd72e33 (diff) | |
| download | cpython-ab45e689be9e954de37fcb18d584fa09a19111f3.zip cpython-ab45e689be9e954de37fcb18d584fa09a19111f3.tar.gz cpython-ab45e689be9e954de37fcb18d584fa09a19111f3.tar.bz2 | |
Merge from 3.2
| -rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 357eaa5..401bc41 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -190,7 +190,7 @@ class bdist_rpm(Command): if self.fix_python: self.python = sys.executable else: - self.python = "python" + self.python = "python3" elif self.fix_python: raise DistutilsOptionError( "--python and --fix-python are mutually exclusive options") @@ -320,6 +320,7 @@ class bdist_rpm(Command): rpm_cmd.append('-bb') else: rpm_cmd.append('-ba') + rpm_cmd.extend(['--define', '__python %s' % self.python]) if self.rpm3_mode: rpm_cmd.extend(['--define', '_topdir %s' % os.path.abspath(self.rpm_base)]) @@ -49,6 +49,9 @@ Core and Builtins Library ------- +- Issue #14443: Tell rpmbuild to use the correct version of Python in + bdist_rpm. Initial patch by Ross Lagerwall. + - Issue14929: Stop Idle 3.x from closing on Unicode decode errors when grepping. Patch by Roger Serwy. |