[X2Go-Commits] [buildscripts] 01/01: wait for build if arch is i386, use ps instead of chrooted-mounted /proc

[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 75b78d6725e58605484d063929f082702feb179e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 11 10:49:46 2014 +0100

    wait for build if arch is i386, use ps instead of chrooted-mounted /proc
---
 bin/build-rpm-package |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 31d5efb..d93928c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -256,7 +256,7 @@ build_packages() {
 						elif [ "x$l_DIST" = "xsles" ]; then
 							DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
 						fi
-						while mount | grep /var/cache/obs-build/${l_DIST}/${l_CODENAME}/x86_64/proc 1>/dev/null; do
+						while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/" | grep "sudo obs"; do
 							echo "Waiting for some other build to finish..."
 							sleep 30
 						done
@@ -301,6 +301,10 @@ build_packages() {
 						elif [ "x$l_DIST" = "xsles" ]; then
 							DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
 						fi
+						while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/" | grep "sudo obs"; do
+							echo "Waiting for some other build to finish..."
+							sleep 30
+						done
 						if linux32 sudo obs-build \
 						                    --nosignature \
 						                    --repo "http://packages.x2go.org/${l_DIST}/$l_CODENAME/extras" \

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