fix ported eend function return value

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 5964d55..8c145b5 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -7,8 +7,6 @@
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
-set -e # exit on any error
-
 # variables {{{
 PN="$(basename $0)"
 VERSION="$(dpkg --list $PN 2>/dev/null| awk '/^i/ {print $3}')"
@@ -131,6 +129,7 @@ eend() {
   if [ $retval -gt 0 ]; then
     printf " ${BAD}-> Failed (rc=${retval})${NORMAL}\n"
   fi
+  return $retval
 }
 
 check4root(){
@@ -499,13 +498,9 @@ if [ $RELEASE = "lenny" ]; then
 fi
 
 ERRORFILE=$(mktemp)
-set +e
-# TODO: better error handling?
 yes | mdadm --create "${TARGET}" --level="${RAIDLEVEL}" \
       --raid-devices="${NUM_PARTITIONS}" ${METADATA_VERSION} ${SELECTED_PARTITIONS} >/dev/null 2>$ERRORFILE
 RC=$?
-set -e
-
 if [ "$RC" = 0 ] ; then
    dialog --title "$PN" --msgbox \
    "Creating $TARGET was successful." 0 0
@@ -546,6 +541,7 @@ Last chance to quit. Timeout of 10 seconds running....
 
 Do you want to stop now?" 0 0 2>/dev/null
 }
+# }}}
 
 # make sure the user is aware of the used configuration {{{
 checkconfiguration()