Problem: simpleimage is built even if integration script fails

Solution: call cleanup_and_exit 1 if it fail
KyleFromKitware · Jan 25, 2016 · 120f819 · 120f819
1 parent d40cb0d
commit 120f819
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build-recipe-simpleimage b/build-recipe-simpleimage
@@ -32,7 +32,7 @@ recipe_build_simpleimage() {
     [ -x $BUILD_ROOT/bin/bash ] && SHELL="/bin/bash"
     if [ "`grep '^%build$' $BUILD_ROOT$TOPDIR/SOURCES/simpleimage`" ]; then
       echo "Running integration script..."
-      sed -n '/%build/,$ p' $BUILD_ROOT$TOPDIR/SOURCES/simpleimage | tail -n +2 | chroot $BUILD_ROOT $SHELL -x
+      sed -n '/%build/,$ p' $BUILD_ROOT$TOPDIR/SOURCES/simpleimage | tail -n +2 | chroot $BUILD_ROOT $SHELL -x || cleanup_and_exit 1
       echo "Integration script finished."
     fi