# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1366664448 -7200
# Node ID d487338fdabec6bbb48af292ceb826f99bfa4433
# Parent  eb1a1672f7ab2241ed1aadf56450d727e89502c6
Added error handling for when the debootstrap commands fail.

diff -r eb1a1672f7ab -r d487338fdabe user-setup
--- a/user-setup	Sun Nov 04 20:37:56 2012 +0100
+++ b/user-setup	Mon Apr 22 23:00:48 2013 +0200
@@ -36,10 +36,22 @@
 PATH=$PATH${PATH:+:}/usr/sbin:/sbin
 
 if [ "$AS_ROOT" ]; then
-        sudo debootstrap --include="gnupg,$KEYRING" "$USERINSTALL_CODENAME" "$PACKAGEROOT" "$MIRROR"
+        if ! sudo debootstrap --include="gnupg,$KEYRING" "$USERINSTALL_CODENAME" "$PACKAGEROOT" "$MIRROR" ; then
+                cat 1>&2 <<EOF
+Failed to complete an installation of the chosen distribution.
+See the error messages above for more information.
+EOF
+		exit 1
+        fi
 else
-        fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include="gnupg,$KEYRING" \
-                "$USERINSTALL_CODENAME" "$PACKAGEROOT" "$MIRROR"
+        if ! fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include="gnupg,$KEYRING" \
+                "$USERINSTALL_CODENAME" "$PACKAGEROOT" "$MIRROR" ; then
+                cat 1>&2 <<EOF
+Failed to complete an installation of the chosen distribution.
+See the error messages above for more information.
+EOF
+		exit 1
+        fi
 fi
 
 cat 1>&2 <<EOF