From: Alexandre Oliva <lxoliva@fsfla.org>
Date: Sat, 17 Oct 2020 19:15:48 +0000 (-0400)
Subject: Clean up after check-failed release; wipe out sources once checking is done
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=b5957383fdb6c9a302add83fa7042a684d7a3a2c;p=releases.git

Clean up after check-failed release; wipe out sources once checking is done
---

diff --git a/mkgitrel.pub b/mkgitrel.pub
index f48fc5f1155..0295e14cf23 100755
--- a/mkgitrel.pub
+++ b/mkgitrel.pub
@@ -34,6 +34,13 @@ DATE=$(git cat-file -p incr/v$rel |
              }') &&
 export GIT_COMMITTER_DATE=$DATE GIT_AUTHOR_DATE=$DATE &&
 
+if test -f linux-libre-$rel.check; then
+    echo linux-libre-$rel.check exists, abandoning this release
+    git tag -d incr/v$rel logs/v$rel sources/v$rel |&
+      tee -a linux-libre-$rel.dtags
+    continue
+fi &&
+
 while test -f linux-libre-$rel.patck; do
   echo please verify linux-libre-$rel.patck and move it away to complete the release
   sleep 30
@@ -69,8 +76,10 @@ for x in scripts sources logs; do
     git tag public/$x/v$rel $x/v$rel &&
     git tag -d $x/v$rel
   fi
-done
+done &&
+
+git worktree remove --force sources/v$rel
 
 done &&
 
-$success
\ No newline at end of file
+$success
diff --git a/mkgitrel.rel b/mkgitrel.rel
index 6e8aa083259..43f51391dc1 100755
--- a/mkgitrel.rel
+++ b/mkgitrel.rel
@@ -34,6 +34,12 @@ DATE=$(git cat-file -p incr/v$rel |
              }') &&
 export GIT_COMMITTER_DATE=$DATE GIT_AUTHOR_DATE=$DATE &&
 
+if test -f linux-libre-$rel.check; then
+    success=false
+    git worktree remove logs/v$rel
+    continue
+fi &&
+
 plist="patch-$prev0-$rel" &&
 if test "$prev0" != "$prevn"; then
   plist="$plist patch-$prevn-$rel"
@@ -83,8 +89,7 @@ if test "$rup" = "$cbr"; then
 fi &&
 
 git worktree remove logs/v$rel &&
-git worktree remove scripts/v$rel &&
-git worktree remove --force sources/v$rel
+git worktree remove scripts/v$rel
 
 done &&