From 6e809b607f444a786e674795380071fce04000b2 Mon Sep 17 00:00:00 2001
From: Freedo <freedo@linux-libre.fsfla.org>
Date: Tue, 13 Jun 2023 03:30:27 +0000
Subject: [PATCH] mkgitrel.cln: run single check pass and refuse --force
 releases

---
 mkgitrel.cln | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mkgitrel.cln b/mkgitrel.cln
index 85c3ad54c20..b2fd4df2db3 100755
--- a/mkgitrel.cln
+++ b/mkgitrel.cln
@@ -59,7 +59,10 @@ git worktree add --detach logs/v$rel public/logs/v$prevn &&
 (cd logs/v$rel && git rm -f linux-*) &&
 
 if (cd sources/v$rel && ../../scripts/v$rel/deblob-$cbr $force) \
-       >& logs/v$rel/linux-libre-$rel.log; then
+       >& logs/v$rel/linux-libre-$rel.log &&
+   { test -z "$force" ||
+       test $(grep -i error logs/v$rel/linux-libre-$rel.log |
+		grep -c -v force) = 0; }; then
   :
 else
   grep -i error logs/v$rel/linux-libre-$rel.log > linux-libre-$rel.check
@@ -116,13 +119,14 @@ if test "$prev0" != "$prevn"; then
     public/sources/v$prevn sources/v$rel -- > patch-$prevn-$rel
 fi &&
 
-{ scripts/v$rel/deblob-check --use-awk linux-libre-$rel.tar ||
+{ { test -z "$force" &&
+      scripts/v$rel/deblob-check --use-awk linux-libre-$rel.tar; } ||
     scripts/v$rel/deblob-check --use-awk -C linux-libre-$rel.tar \
       > linux-libre-$rel.check ||
     { success=false; continue; }; } &&
 
 if test -n "$force"; then
-  echo --force is for testing only >> linux-libre-$rel.check
+  echo aborting, --force is for testing only >> linux-libre-$rel.check
   success=false
 fi &&
 
-- 
2.31.1