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

Do not specify file digest algorithms

Browse source 
Fix #331

Do not specify `_source_filedigest_algorithm`
and `_binary_filedigest_algorithm` anymore

EPEL5 did understand only MD5 checksums but since it is EOLed and
newer releases know SHA, we can probably safely remove it.
This commit is contained in:
Jakub Kadlcik 2020-04-18 17:15:57 +02:00
parent f71033d7ce
commit 40287ca668
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,10 +239,10 @@ 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 --nodeps -bs %s' % (
rpmbuild_options, self._get_rpmbuild_dir_options(),
define_dist, self.spec_file))
cmd = ('rpmbuild %s %s %s --nodeps -bs %s' % (
rpmbuild_options, self._get_rpmbuild_dir_options(),
define_dist, self.spec_file))
run_command_func = run_command if self.quiet else run_command_print
output = run_command_func(cmd)
self.srpm_location = find_wrote_in_rpmbuild_output(output)[0]
@ -274,8 +274,6 @@ class BuilderBase(object):
cmd = 'rpmbuild {0}'.format(
" ".join([
'--define "_source_filedigest_algorithm md5"',
'--define "_binary_filedigest_algorithm md5"',
self.rpmbuild_options,
self._scl_to_rpmbuild_option(),
self._get_rpmbuild_dir_options(),