Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ab45e689
Commit
ab45e689
authored
May 28, 2012
by
Nick Coghlan
Browse files
Options
Browse Files
Download
Plain Diff
Merge from 3.2
parents
7e18f43e
4b6045c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Lib/distutils/command/bdist_rpm.py
Lib/distutils/command/bdist_rpm.py
+2
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/distutils/command/bdist_rpm.py
View file @
ab45e689
...
...
@@ -190,7 +190,7 @@ class bdist_rpm(Command):
if
self
.
fix_python
:
self
.
python
=
sys
.
executable
else
:
self
.
python
=
"python"
self
.
python
=
"python
3
"
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
)])
...
...
Misc/NEWS
View file @
ab45e689
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment