[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: use the git clone in the temporary directory as the sbuild target, not the original sources directory.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit a3a2bcc94f50181b84fd81cd34d8f1ffd0d02f60
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 15 13:28:14 2016 +0100

    bin/sbuild-deb-package: use the git clone in the temporary directory as the sbuild target, not the original sources directory.
    
    The previous behavior re-introduced a very bad race condition, as sbuild
    runs dh_clean in the source directory prior to taring it up and
    transferring it into a schroot session for building.
    
    This means that we're:
      - manipulating the original sources directory even though we should
        only ever modify a temporary clone
      - will run into build failures when multiple build processes change the
        original source directory at the same time.
---
 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 ef24c0c..179702d 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -344,16 +344,16 @@ build_packages() {
 				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}"
+						nice ${SBUILD} "${sbuild_options_armhf[@]}" "${TEMP_DIR}/${PROJECT}"
 					}
 				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}"
+						nice ${SBUILD} "${sbuild_options_64[@]}" "${TEMP_DIR}/${PROJECT}"
 					}
 					[ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && {
 						cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386"
-						nice ${SBUILD} "${sbuild_options_32[@]}" "${PROJECT_DIR}"
+						nice ${SBUILD} "${sbuild_options_32[@]}" "${TEMP_DIR}/${PROJECT}"
 					}
 				fi
 			done

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git