summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-09-11 16:20:50 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-09-11 16:48:29 +0200
commit4ee50b14f346be289a90fd9789d55e7998db6cc2 (patch)
tree18cb8ff9de04c8ee7fda8b40ef2dc07694710bbe
parentb4e6d9bb1dfe580757cc1ff922807a9570409cbd (diff)
downloadptxdist-4ee50b14f346be289a90fd9789d55e7998db6cc2.tar.gz
ptxdist-4ee50b14f346be289a90fd9789d55e7998db6cc2.tar.xz
ptxd_make_image_archive: correctly propagate errors
If okpg fails without this then the whole workspace is added to the archive. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_make_image_archive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_image_archive.sh b/scripts/lib/ptxd_make_image_archive.sh
index 0eb8b93b3..d2a891816 100644
--- a/scripts/lib/ptxd_make_image_archive.sh
+++ b/scripts/lib/ptxd_make_image_archive.sh
@@ -16,10 +16,10 @@ ptxd_make_image_archive_impl() {
ptxd_get_ipkg_files ${image_pkgs} &&
ptxd_make_image_extract_xpkg_files "${pkg_dir}" &&
cd "${pkg_dir}" &&
- echo -ne "\nCreating $(ptxd_print_path "${image_image}") "
+ echo -ne "\nCreating $(ptxd_print_path "${image_image}") " &&
if [ -n "${image_label}" ]; then
echo -n "with label \"${image_label}\" "
- fi
+ fi &&
echo -ne "...\n" &&
tar "${image_label_args[@]}" -zcf "${image_image}" .
local ret=$?