From 40287ca668539edcca0e519657f9540f3703f894 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Sat, 18 Apr 2020 17:15:57 +0200 Subject: [PATCH] Do not specify file digest algorithms 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. --- src/tito/builder/main.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tito/builder/main.py b/src/tito/builder/main.py index 38aa05a..1ab7490 100644 --- a/src/tito/builder/main.py +++ b/src/tito/builder/main.py @@ -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(),