diff options
| author | Anthony Baxter <anthonybaxter@gmail.com> | 2004-06-11 17:16:46 (GMT) |
|---|---|---|
| committer | Anthony Baxter <anthonybaxter@gmail.com> | 2004-06-11 17:16:46 (GMT) |
| commit | c982bbde1c5012202187b8e398fd631b6cec214b (patch) | |
| tree | fbad3bdda3a75cf82c524d122e7a2756345db4a4 /Lib/distutils | |
| parent | 01e80b45d6f2d2b2eac5e81731c3af80f09214c2 (diff) | |
| download | cpython-c982bbde1c5012202187b8e398fd631b6cec214b.zip cpython-c982bbde1c5012202187b8e398fd631b6cec214b.tar.gz cpython-c982bbde1c5012202187b8e398fd631b6cec214b.tar.bz2 | |
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!)
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 7 |
1 files changed, 6 insertions, 1 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() |