summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-13 21:20:54 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:22 +0100
commitee8f3c73b971f9332cfc2bf9f71e532af02c464a (patch)
treef5128e58c055d7c57b17e581ee489c579d37de25
parent9f865fce29db8c910f2d6a22c4a2d6d15ecff9f4 (diff)
downloadvyos-live-build-ee8f3c73b971f9332cfc2bf9f71e532af02c464a.tar.gz
vyos-live-build-ee8f3c73b971f9332cfc2bf9f71e532af02c464a.zip
Avoid running helpers twice when using auto (Closes: #584884).
-rwxr-xr-xscripts/build/lb_build1
-rwxr-xr-xscripts/build/lb_clean1
-rwxr-xr-xscripts/build/lb_config1
3 files changed, 3 insertions, 0 deletions
diff --git a/scripts/build/lb_build b/scripts/build/lb_build
index 0638629f8..332ca5576 100755
--- a/scripts/build/lb_build
+++ b/scripts/build/lb_build
@@ -25,6 +25,7 @@ if [ "${1}" != "noauto" ] && [ -x auto/build ]
then
Echo_message "Executing auto/build script."
./auto/build ${@}
+ exit ${?}
fi
if [ "${1}" = "noauto" ]
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index f734a50b0..e5ae3df6e 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -18,6 +18,7 @@ if [ "${1}" != "noauto" ] && [ -x auto/clean ]
then
Echo_message "Executing auto/clean script."
./auto/clean ${@}
+ exit ${?}
fi
if [ "${1}" = "noauto" ]
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 3cf4a6d51..afb6935d8 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -18,6 +18,7 @@ if [ "${1}" != "noauto" ] && [ -x auto/config ]
then
Echo_message "Executing auto/config script."
./auto/config ${@}
+ exit ${?}
fi
if [ "${1}" = "noauto" ]