Bug 957381: rpmbuild builds a -debuginfo rpm on recent Redhat and Fedora releases.
Ignore it, rather than breaking.
Will backport.
(and r1.1000 for Misc/NEWS!)
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 237cc70..4be9999 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -313,10 +313,15 @@
if not self.source_only:
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, \
"unexpected number of RPM files found: %s" % rpms
self.move_file(rpms[0], self.dist_dir)
-
+ if debuginfo:
+ self.move_file(debuginfo[0], self.dist_dir)
# run()
diff --git a/Misc/NEWS b/Misc/NEWS
index 86eac9f..bf808b5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -336,6 +336,9 @@
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.
- Fixed #877165: distutils now picks the right C++ compiler command
@@ -422,7 +425,7 @@
- bisect.py and heapq.py now have underlying C implementations
for better performance.
-- heapq.py has two new functions, nsmallest() and nlargest().
+- heapq.py has two new functions, nsmallest() and nlargest().
- traceback.format_exc has been added (similar to print_exc but it returns
a string).