[Python-checkins] python/dist/src/Lib/distutils/command bdist_rpm.py, 1.37, 1.38

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3026/Lib/distutils/command

Modified Files:
	bdist_rpm.py 
Log Message:
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!)


Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** bdist_rpm.py	19 Nov 2002 13:12:28 -0000	1.37
--- bdist_rpm.py	11 Jun 2004 17:16:46 -0000	1.38
***************
*** 314,321 ****
              if not self.source_only:
                  rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
                  assert len(rpms) == 1, \
                         "unexpected number of RPM files found: %s" % rpms
                  self.move_file(rpms[0], self.dist_dir)
! 
      # run()
  
--- 314,326 ----
              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()