Return with appropriate return code to avoid catching 'set -e'

1 files changed, 4 insertions, 2 deletions

diff --git a/build b/build
index a990d33..8a26e10 100755
--- a/build
+++ b/build
@@ -95,8 +95,10 @@ import()
 include()
 {
 	set -- "${1}" "`echo "${1}" | tr '-' '_'`"
-	test -f "${BUILDER_CFGDIR}/${1}" || die "config not found '${1}'"
-	eval "test -z \"\${BUILDER_INCLUDE_${2}}\"" || return
+	if ! test -f "${BUILDER_CFGDIR}/${1}"; then
+		die "config not found '${1}'"
+	fi
+	eval "test -z \"\${BUILDER_INCLUDE_${2}}\"" || return 0
 	. "${BUILDER_CFGDIR}/${1}"
 	eval "BUILDER_INCLUDE_${2}='${BUILDER_CFGDIR}/${1}'"
 	if [ -z "${BUILDER_INCLUDED}" ]; then