summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-09-02 20:50:17 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:46 +0100
commit74a7af6571930eb0a89cdd7140a6663a3ff60645 (patch)
tree4be601a9ec24fd988b15cad714f45dbea14f903b
parente9c580b6ae3fa4b7c740d9eaa4b00b89bbbcf01a (diff)
downloadvyos-live-build-74a7af6571930eb0a89cdd7140a6663a3ff60645.tar.gz
vyos-live-build-74a7af6571930eb0a89cdd7140a6663a3ff60645.zip
Adding a message about which hook made a build fail, if any.
-rwxr-xr-xhelpers/lh_binary_local-hooks2
-rwxr-xr-xhelpers/lh_chroot_hooks2
-rwxr-xr-xhelpers/lh_chroot_local-hooks2
3 files changed, 3 insertions, 3 deletions
diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks
index 6d4beaf0a..fbc99e5ab 100755
--- a/helpers/lh_binary_local-hooks
+++ b/helpers/lh_binary_local-hooks
@@ -49,7 +49,7 @@ then
fi
# Executing hook
- ./"${HOOK}"
+ ./"${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
done
# Creating stage file
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 488489864..4821d4645 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -54,7 +54,7 @@ do
fi
# Executing hook
- Chroot chroot "./root/${HOOK}"
+ Chroot chroot "./root/${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
# Removing hook
rm -f chroot/root/"${HOOK}"
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index f5fccebe8..878becb39 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -52,7 +52,7 @@ then
fi
# Executing hook
- Chroot chroot "/root/$(basename ${HOOK})"
+ Chroot chroot "/root/$(basename ${HOOK})" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
# Removing hook
rm -f chroot/root/"$(basename ${HOOK})"