From cfa16515e4c5a4d4fd6a5bf4f097379ef54b4a5d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Tue, 23 Jan 2024 08:50:17 -0500
Subject: [PATCH] fix debootstrap error handler

We were using the old-style "RC" error checking. Now that has all been
moved to a global error handler, so we need to move log parsing there
as well.

Fixes: 9706bd9 (improved error handling, removed RC=$? noops, 2023-12-22)
Closes: #268
---
 grml-debootstrap | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/grml-debootstrap b/grml-debootstrap
index 9ad2662..dfef90b 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -13,6 +13,12 @@ error_handler() {
    last_bash_command="$BASH_COMMAND"
    echo "Unexpected non-zero exit code $last_exit_code in ${BASH_SOURCE[*]} at line ${BASH_LINENO[*]} detected!
 last bash command: $last_bash_command"
+   if [ -r "$MNTPOINT/debootstrap/debootstrap.log" ] && \
+          [ -s "$MNTPOINT/debootstrap/debootstrap.log" ] ; then
+       einfo "Presenting last ten lines of debootstrap.log:"
+       tail -10 "${MNTPOINT}"/debootstrap/debootstrap.log
+       einfo "End of debootstrap.log"
+   fi
    ## Check if "bailout" function is available.
    ## This is not the case in chroot-script.
    if command -v bailout >/dev/null 2>&1; then
@@ -1724,16 +1730,6 @@ debootstrap_system() {
     # shellcheck disable=SC2086
     "$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR"
   fi
-
-  if [ $RC -ne 0 ] ; then
-    if [ -r "$MNTPOINT/debootstrap/debootstrap.log" ] && \
-      [ -s "$MNTPOINT/debootstrap/debootstrap.log" ] ; then
-      einfo "Presenting last ten lines of debootstrap.log:"
-      tail -10 "${MNTPOINT}"/debootstrap/debootstrap.log
-      einfo "End of debootstrap.log"
-    fi
-  fi
-
 }
 # }}}
 
-- 
2.1.4