[X2Go-Commits] [buildscripts] 01/01: allow us overriding the build delay when FORCE_BUILD is used

[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 962ef00fa89ff424e25798046a3e7490454494dd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 11 15:33:52 2014 +0200

    allow us overriding the build delay when FORCE_BUILD is used
---
 bin/build-rpm-package |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 0938191..501ec3b 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -28,6 +28,7 @@ GPG_KEY=
 RPM_DISTS_SUPPORTED="fedora epel opensuse"
 FEDORA_DISTROS="18,19,20,rawhide"
 EPEL_DISTROS="6,7"
+OPENSUSE_DISTROS="12.3,13.1"
 RPM_REPOS_BASE=/var/www/
 
 COMPONENT_MAIN="main"
@@ -340,7 +341,7 @@ delay_build() {
 set_vars $@ && {
 	if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then
 		cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && {
-			if [ "x$FORCE_BUILD" = "xyes" ]; then
+			if [ "x$FORCE_BUILD" = "xyes" ] && [ "x$NO_DELAY" != "yes" ]; then
 				delay_build
 			fi
 			lock_workspace

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