commit c2601c6205ca89dd5f5a2c658b73d090e707f050 Author: Nicolas Vigier boklm@torproject.org Date: Thu Feb 10 13:36:12 2022 +0100

Bug 40429: Make an error when incrementals are missing in hash_incrementals --- projects/release/hash_incrementals | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/release/hash_incrementals b/projects/release/hash_incrementals index 4ab0f4d..7744ddf 100644 --- a/projects/release/hash_incrementals +++ b/projects/release/hash_incrementals @@ -9,7 +9,13 @@ [% ELSE -%] cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %] [% END -%] -sha256sum `ls -1 | grep '.incremental.mar$' | sort` > sha256sums-[% c("var/signed_status") %]-build.incrementals.txt +if ls -1 | grep -q '.incremental.mar$' +then + sha256sum `ls -1 | grep '.incremental.mar$' | sort` > sha256sums-[% c("var/signed_status") %]-build.incrementals.txt +else + echo 'No incrementals were found' >&2 + exit 1 +fi [% IF c("var/sign_build") -%] export HOME="$old_HOME" gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-[% c("var/signed_status") %]-build.incrementals.txt