[Python-checkins] CVS: distutils/distutils/command bdist_rpm.py,1.19,1.20

[Greg Ward]

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

Modified Files:
	bdist_rpm.py 
Log Message:
Renamed --clean to --no-keep-temp and --noclean to --keep-temp.

Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_rpm.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** bdist_rpm.py	2000/09/10 01:21:27	1.19
--- bdist_rpm.py	2000/09/16 15:54:18	1.20
***************
*** 98,105 ****
  
          # Actions to take when building RPM
!         ('clean', None,
!          "clean up RPM build directory [default]"),
!         ('no-clean', None,
           "don't clean up RPM build directory"),
          ('use-rpm-opt-flags', None,
           "compile with RPM_OPT_FLAGS when building from source RPM"),
--- 98,105 ----
  
          # Actions to take when building RPM
!         ('keep-temp', 'k',
           "don't clean up RPM build directory"),
+         ('no-keep-temp', None,
+          "clean up RPM build directory [default]"),
          ('use-rpm-opt-flags', None,
           "compile with RPM_OPT_FLAGS when building from source RPM"),
***************
*** 112,116 ****
         ]
  
!     negative_opt = {'no-clean': 'clean',
                      'no-rpm-opt-flags': 'use-rpm-opt-flags',
                      'rpm2-mode': 'rpm3-mode'}
--- 112,116 ----
         ]
  
!     negative_opt = {'no-keep-temp': 'keep-temp',
                      'no-rpm-opt-flags': 'use-rpm-opt-flags',
                      'rpm2-mode': 'rpm3-mode'}
***************
*** 153,157 ****
          self.obsoletes = None
  
!         self.clean = 1
          self.use_rpm_opt_flags = 1
          self.rpm3_mode = 1
--- 153,157 ----
          self.obsoletes = None
  
!         self.keep_temp = 0
          self.use_rpm_opt_flags = 1
          self.rpm3_mode = 1
***************
*** 304,308 ****
              rpm_cmd.extend(['--define',
                               '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
!         if self.clean:
              rpm_cmd.append('--clean')
          rpm_cmd.append(spec_path)
--- 304,308 ----
              rpm_cmd.extend(['--define',
                               '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
!         if not self.keep_temp:
              rpm_cmd.append('--clean')
          rpm_cmd.append(spec_path)