From 5272d4895a8b6fb42f05b8d24db4a1bbc670b6cd Mon Sep 17 00:00:00 2001 From: "alexandr.kravchenko" <alexander.kravchenko@demlabs.net> Date: Tue, 11 Feb 2020 16:32:38 +0500 Subject: [PATCH] fixed exit error on non-present chroot --- prod_build/linux/debian/conf/version_info | 3 --- prod_build/linux/debian/scripts/pre-build.sh | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 prod_build/linux/debian/conf/version_info diff --git a/prod_build/linux/debian/conf/version_info b/prod_build/linux/debian/conf/version_info deleted file mode 100644 index 288cd5c8..00000000 --- a/prod_build/linux/debian/conf/version_info +++ /dev/null @@ -1,3 +0,0 @@ -VERSION_FILE=config.pri -VERSION_ENTRIES="VER_MAJ VER_MIN VER_PAT VER_CODE" -VERSION_FORMAT="VER_MAJ.VER_MIN-VER_PAT" diff --git a/prod_build/linux/debian/scripts/pre-build.sh b/prod_build/linux/debian/scripts/pre-build.sh index 27dae1c1..a5edcfbc 100755 --- a/prod_build/linux/debian/scripts/pre-build.sh +++ b/prod_build/linux/debian/scripts/pre-build.sh @@ -124,8 +124,10 @@ CHROOT_PREFIX=$1 for distr in $HOST_DISTR_VERSIONS; do #we need to install required dependencies under schroot. for arch in $HOST_ARCH_VERSIONS; do echo "$CHROOT_PREFIX-$distr-$arch" - schroot -c $CHROOT_PREFIX-$distr-$arch -- prod_build/linux/debian/scripts/chroot/pre-build.sh "$PKG_DEPS" + schroot -c $CHROOT_PREFIX-$distr-$arch -- prod_build/linux/debian/scripts/chroot/pre-build.sh "$PKG_DEPS" || errcode=$? + [[ $errcode != 0 ]] && echo "Problems with $CHROOT_PREFIX-$distr-$arch occured. You had installed it, right?" done done +exit 0 ## Maybe we do have the version required? Then we don't need to build it again. CHECK IT THERE! -- GitLab