mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge from 3.2

Browse source
This commit is contained in:
Nick Coghlan 2012-05-28 22:36:07 +10:00
commit ab45e689be
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/distutils/command/bdist_rpm.py
View file

@ -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)])