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!)
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

View file

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