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 "FusionForge".
The branch, 6.0 has been updated
via c0458dd5bb56738e07cb21da113d21a04b08ca86 (commit)
via ab46112a8ff32ed8c5f4a988145cab65e0083050 (commit)
from 530be9ae129fe75d32dff854728750ca7d7466b5 (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 c0458dd5bb56738e07cb21da113d21a04b08ca86
Author: Sylvain Beucler <[email protected]>
Date: Tue Mar 31 16:01:41 2015 +0200
install: install 'scm' by default
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 7fdff1a..94676d6 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -131,7 +131,7 @@ install-lists: install-base-dirs
$(CP_R) cronjobs/lists $(DESTDIR)$(pkgdatadir)/cronjobs/
$(CP_R) post-install.d/lists $(DESTDIR)$(pkgdatadir)/post-install.d/
-install-base: install-base-dirs install-common install-web install-db
+install-base: install-base-dirs install-common install-web install-db
install-scm
PLUGINS=$(shell cd plugins/ && find * -maxdepth 0 -type d)
PLUGINS_INSTALL_TARGETS=$(addprefix install-plugin-,$(PLUGINS))
@@ -171,7 +171,7 @@ uninstall:
post_source_path:=$(shell forge_get_config source_path 2>/dev/null)
post_plugins_path:=$(shell forge_get_config plugins_path 2>/dev/null)
post-install: post-install-base post-install-plugins
-post-install-base: post-install-common post-install-db post-install-web
+post-install-base: post-install-common post-install-db post-install-web
post-install-scm
post-install-common:
$(post_source_path)/post-install.d/common/common.sh configure
post-install-db:
commit ab46112a8ff32ed8c5f4a988145cab65e0083050
Author: Sylvain Beucler <[email protected]>
Date: Tue Mar 31 16:00:37 2015 +0200
systasksd: lock scripts properly
diff --git a/src/common/include/cron_utils.php
b/src/common/include/cron_utils.php
index 43c1f81..9bfecf0 100644
--- a/src/common/include/cron_utils.php
+++ b/src/common/include/cron_utils.php
@@ -92,6 +92,7 @@ function checkChroot() {
// Global, otherwise auto-closed by PHP and we lose the lock!
$locks = array();
function cron_acquire_lock($script) {
+ global $locks;
// Script lock: http://perl.plover.com/yak/flock/samples/slide006.html
if (!isset($locks[$script]))
$locks[$script] = fopen($script, 'r') or die("Failed to ask
lock.\n");
@@ -102,6 +103,7 @@ function cron_acquire_lock($script) {
}
function cron_release_lock($script) {
+ global $locks;
flock($locks[$script], LOCK_UN);
unset($locks[$script]);
}
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile | 4 ++--
src/common/include/cron_utils.php | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
