summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-11 15:33:52 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-11 15:33:52 +0200
commit962ef00fa89ff424e25798046a3e7490454494dd (patch)
tree9a4f1744d77bd1b55f8b4eca95eb5e4c8331cc14
parent0b602a0671e123dea9ad2706c6234848adf43946 (diff)
downloadbuildscripts-962ef00fa89ff424e25798046a3e7490454494dd.tar.gz
buildscripts-962ef00fa89ff424e25798046a3e7490454494dd.tar.bz2
buildscripts-962ef00fa89ff424e25798046a3e7490454494dd.zip
allow us overriding the build delay when FORCE_BUILD is used
-rwxr-xr-xbin/build-rpm-package3
1 files changed, 2 insertions, 1 deletions
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