[Python-checkins] CVS: distutils/distutils/command bdist_rpm.py,1.8,1.9

Greg Ward python-dev@python.org
Fri, 2 Jun 2000 18:03:58 -0700


Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6683/command

Modified Files:
	bdist_rpm.py 
Log Message:
Patch from Harry Henry Gebel: fixes a bit of code that slipped by my
overhaul last night.

Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_rpm.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** bdist_rpm.py	2000/06/02 02:01:51	1.8
--- bdist_rpm.py	2000/06/03 01:03:55	1.9
***************
*** 6,10 ****
  # created 2000/04/25, by Harry Henry Gebel
  
! __revision__ = "$Id: bdist_rpm.py,v 1.8 2000/06/02 02:01:51 gward Exp $"
  
  import os, string, re
--- 6,10 ----
  # created 2000/04/25, by Harry Henry Gebel
  
! __revision__ = "$Id: bdist_rpm.py,v 1.9 2000/06/03 01:03:55 gward Exp $"
  
  import os, string, re
***************
*** 309,315 ****
          else:
              rpm_args.append('-ba')
-         topdir = os.getcwd() + 'build/rpm'
          rpm_args.extend(['--define',
!                          '_topdir ' + os.getcwd() + '/build/rpm',])
          if self.clean:
              rpm_args.append('--clean')
--- 309,314 ----
          else:
              rpm_args.append('-ba')
          rpm_args.extend(['--define',
!                          '_topdir %s/%s' % (os.getcwd(), rpm_base),])
          if self.clean:
              rpm_args.append('--clean')