mirror of
https://github.com/python/cpython.git
synced 2025-08-02 16:13:13 +00:00
Merge from 3.2
This commit is contained in:
commit
ab45e689be
2 changed files with 5 additions and 1 deletions
|
@ -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.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue