release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hookup tito's --no-cleanup with rpmbuild's --noclean.

Browse source
This commit is contained in:
Devan Goodwin 2016-10-05 14:25:24 -03:00
parent de3e7b62a2
commit f3bcf9720f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tito/builder/main.py
View file

@ -224,6 +224,12 @@ class BuilderBase(object):
self.srpm_location = find_wrote_in_rpmbuild_output(output)[0]
self.artifacts.append(self.srpm_location)
# Assume that if tito's --no-cleanup option is set, also disable %clean in rpmbuild:
def _get_clean_option(self):
if self.no_cleanup:
return "--noclean"
return "--clean"
def rpm(self):
""" Build an RPM. """
self._create_build_dirs()
@ -237,9 +243,9 @@ class BuilderBase(object):
rpmbuild_options = self.rpmbuild_options + self._scl_to_rpmbuild_option()
cmd = ('rpmbuild --define "_source_filedigest_algorithm md5" '
'--define "_binary_filedigest_algorithm md5" %s %s %s --clean '
'--define "_binary_filedigest_algorithm md5" %s %s %s %s '
'-ba %s' % (rpmbuild_options,
self._get_rpmbuild_dir_options(), define_dist, self.spec_file))
self._get_rpmbuild_dir_options(), define_dist, self._get_clean_option(), self.spec_file))
debug(cmd)
try:
output = run_command_print(cmd)

2
src/tito/cli.py
View file

@ -314,7 +314,7 @@ class BuildModule(BaseCliModule):
help="use current branch HEAD instead of latest package tag")
self.parser.add_option("--no-cleanup", dest="no_cleanup",
action="store_true",
help="do not clean up temporary build directories/files")
help="do not clean up temporary tito build directories/files, and disable rpmbuild %clean")
self.parser.add_option("--tag", dest="tag", metavar="PKGTAG",
help="build a specific tag instead of the latest version " +
"(i.e. spacewalk-java-0.4.0-1)")