Commit 6e5c80f2 authored by Greg Ward's avatar Greg Ward

Renamed --clean to --no-keep-temp and --noclean to --keep-temp.

parent 8bcda91b
...@@ -97,10 +97,10 @@ class bdist_rpm (Command): ...@@ -97,10 +97,10 @@ class bdist_rpm (Command):
"capabilities made obsolete by this package"), "capabilities made obsolete by this package"),
# Actions to take when building RPM # Actions to take when building RPM
('clean', None, ('keep-temp', 'k',
"clean up RPM build directory [default]"),
('no-clean', None,
"don't clean up RPM build directory"), "don't clean up RPM build directory"),
('no-keep-temp', None,
"clean up RPM build directory [default]"),
('use-rpm-opt-flags', None, ('use-rpm-opt-flags', None,
"compile with RPM_OPT_FLAGS when building from source RPM"), "compile with RPM_OPT_FLAGS when building from source RPM"),
('no-rpm-opt-flags', None, ('no-rpm-opt-flags', None,
...@@ -111,7 +111,7 @@ class bdist_rpm (Command): ...@@ -111,7 +111,7 @@ class bdist_rpm (Command):
"RPM 2 compatibility mode"), "RPM 2 compatibility mode"),
] ]
negative_opt = {'no-clean': 'clean', negative_opt = {'no-keep-temp': 'keep-temp',
'no-rpm-opt-flags': 'use-rpm-opt-flags', 'no-rpm-opt-flags': 'use-rpm-opt-flags',
'rpm2-mode': 'rpm3-mode'} 'rpm2-mode': 'rpm3-mode'}
...@@ -152,7 +152,7 @@ class bdist_rpm (Command): ...@@ -152,7 +152,7 @@ class bdist_rpm (Command):
self.build_requires = None self.build_requires = None
self.obsoletes = None self.obsoletes = None
self.clean = 1 self.keep_temp = 0
self.use_rpm_opt_flags = 1 self.use_rpm_opt_flags = 1
self.rpm3_mode = 1 self.rpm3_mode = 1
...@@ -303,7 +303,7 @@ class bdist_rpm (Command): ...@@ -303,7 +303,7 @@ class bdist_rpm (Command):
if self.rpm3_mode: if self.rpm3_mode:
rpm_cmd.extend(['--define', rpm_cmd.extend(['--define',
'_topdir %s/%s' % (os.getcwd(), self.rpm_base),]) '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
if self.clean: if not self.keep_temp:
rpm_cmd.append('--clean') rpm_cmd.append('--clean')
rpm_cmd.append(spec_path) rpm_cmd.append(spec_path)
self.spawn(rpm_cmd) self.spawn(rpm_cmd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment