This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 26fb2a25510b1bcd5d6e55e1f4d086f84bfb5fa9 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 15 08:04:14 2016 +0100 bin/sbuild-deb-package: use if-else-fi instead of chaining commands - as stuff within the command chain might fail and execution continue on the supposed-to-be else branch, which at that point should not be executed at all. --- bin/sbuild-deb-package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index ee8357f..ef24c0c 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -341,12 +341,12 @@ build_packages() { sbuild_options_32=("${sbuild_options[@]}" "--arch=i386" "--debbuildopts=-B") sbuild_options_armhf=("${sbuild_options[@]}" "--arch=armhf" "--chroot=${codename}-armhf-raspbian-sbuild") - [ "${l_DIST}" = "raspbian" ] && { + if [ "${l_DIST}" = "raspbian" ]; then [ "${SKIP_ARCH}" != "armhf" ] && grep -Eqs 'Architecture.*(all|any|armhf)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/armhf" nice ${SBUILD} "${sbuild_options_armhf[@]}" "${PROJECT_DIR}" } - } || { + else [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" nice ${SBUILD} "${sbuild_options_64[@]}" "${PROJECT_DIR}" @@ -355,7 +355,7 @@ build_packages() { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" nice ${SBUILD} "${sbuild_options_32[@]}" "${PROJECT_DIR}" } - } + fi done } done -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git