[X2Go-Commits] [buildscripts] 03/03: bin/build-rpm-package: build noarch packages for i386 on non-SuSE-platforms.

[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 27853a719cca777701b7ee86ba0bcce1f0ec98c3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Dec 8 20:05:27 2016 +0100

    bin/build-rpm-package: build noarch packages for i386 on non-SuSE-platforms.
---
 bin/build-rpm-package |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 42542b3..dc713dc 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -906,8 +906,8 @@ build_packages() {
 						done
 					fi
 				fi
-				if [ "x${SKIP_ARCH}" != "xi386" ] && [ "${IS_NOARCH}" != "yes" ]; then
-					if [ "x${l_DIST}" = "xopensuse" ] || [ "x${l_DIST}" = "xsle" ]; then
+				if [ "x${SKIP_ARCH}" != "xi386" ]; then
+					if { [ "x${l_DIST}" = "xopensuse" ] || [ "x${l_DIST}" = "xsle" ]; } && [ "${IS_NOARCH}" != "yes" ]; then
 						while ps ax | grep -E "build.*/var/cache/obs-build/${l_DIST}/${l_CODENAME}/i586/" | grep "sudo obs"; do
 							echo "Waiting for some other build to finish..."
 							sleep 30

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