mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 07:26:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Bug 957381: rpmbuild builds a -debuginfo rpm on recent Redhat and Fedora releases.

Browse source 
Ignore it, rather than breaking.

Will backport.

(and r1.1000 for Misc/NEWS!)
This commit is contained in:
Anthony Baxter 2004-06-11 17:16:46 +00:00
parent 01e80b45d6
commit c982bbde1c
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -313,10 +313,15 @@ class bdist_rpm (Command):
if not self.source_only: if not self.source_only:
rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm")) rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'], \
"*/*debuginfo*.rpm"))
if debuginfo:
rpms.remove(debuginfo[0])
assert len(rpms) == 1, \ assert len(rpms) == 1, \
"unexpected number of RPM files found: %s" % rpms "unexpected number of RPM files found: %s" % rpms
self.move_file(rpms[0], self.dist_dir) self.move_file(rpms[0], self.dist_dir)
if debuginfo:
self.move_file(debuginfo[0], self.dist_dir)
# run() # run()

3
Misc/NEWS
View file

@ -336,6 +336,9 @@ Extension modules
Library Library
------- -------
- Bug #957381: distutils bdist_rpm no longer fails on recent RPM versions
that generate a *-debuginfo.rpm.
- os.path.devnull has been added for all supported platforms. - os.path.devnull has been added for all supported platforms.
- Fixed #877165: distutils now picks the right C++ compiler command - Fixed #877165: distutils now picks the right C++ compiler command