[X2Go-Commits] buildscripts.git - master (branch) updated: aa9bfbf74e03c3499fa0e4ded749176f0de97a95

[X2Go dev team]

The branch, master has been updated
       via  aa9bfbf74e03c3499fa0e4ded749176f0de97a95 (commit)
      from  40754ccd94cd436b44343aeea25daa49b1c3809d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aa9bfbf74e03c3499fa0e4ded749176f0de97a95
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 13 22:21:22 2013 +0100

    auto-delay forced builds, as if several builds are triggered at once, this is likely to fail (repoquery locks, dpkg-source on changing Git files)

-----------------------------------------------------------------------

Summary of changes:
 bin/build-deb-package |    7 +++++++
 bin/build-rpm-package |    8 ++++++++
 2 files changed, 15 insertions(+)

The diff of changes is:
diff --git a/bin/build-deb-package b/bin/build-deb-package
index 49c0d80..9cc8bae 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -333,10 +333,17 @@ unlock_workspace() {
 	rm -f $LOCK_FILE
 }
 
+delay_build() {
+	sleep $[ ( $RANDOM % 30 )  + 1 ]s
+}
+
 ### MAIN ###
 set_vars $@ && {
 	if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then
 		cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && {
+			if [ "x$FORCE_BUILD" = "xyes" ]; then
+				delay_build
+			fi
 			lock_workspace
 			prepare_workspace && {
 				unlock_workspace
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 03b31c5..01d107b 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -312,10 +312,18 @@ unlock_workspace() {
 	rm -f $LOCK_FILE
 }
 
+delay_build() {
+	sleep $[ ( ( $RANDOM % 10 )  + 1 ) * 10 ]s
+}
+
+
 ### MAIN ###
 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
+				delay_build
+			fi
 			lock_workspace
 			prepare_workspace && {
 				unlock_workspace


hooks/post-receive
-- 
buildscripts.git (X2Go packaging scripts)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).