diff options
| -rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
2 files changed, 10 insertions, 2 deletions
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 @@ class bdist_rpm (Command): 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() @@ -336,6 +336,9 @@ Extension modules 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 @@ Library - 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). |