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 1c0f2ceda34d746a4db6ae9e46e2562a620316bd (commit)
via 538255509f003e0c4cc32cb98080cc2764edf260 (commit)
from a9b01c7a7f948c5bbae71637bc9f3f9f8ef5627c (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1c0f2ceda34d746a4db6ae9e46e2562a620316bd
commit 1c0f2ceda34d746a4db6ae9e46e2562a620316bd
Author: Sylvain Beucler <[email protected]>
Date: Mon Nov 2 12:07:25 2015 +0100
systasksd: fix another race condition by flushing nscd cache after the
nss_groups check
diff --git a/src/CHANGES b/src/CHANGES
index 0fa454d..eda1794 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,6 +2,7 @@ FusionForge 6.0.4:
* Accounts: do not accept digits-only user and group names, to avoid confusion
with UID/GID in system commands (Inria)
* MTA-Exim4: restart exim4 on install
* Plugin SCM: improve user matching when computing stats (Inria)
+* Plugin SCM: fix another race condition when creating project with SCM
selected (Inria)
* Plugin scmhook: fix non-editable mailing list name in some configurations
(Inria)
* Plugin MediaWiki: fix permission error when upgrading suspended projects
database (Inria & TrivialDev)
* Plugin Projects Hierarchy: don't display a project as possible child if
there's no read access to it (Inria)
diff --git a/src/bin/systasksd b/src/bin/systasksd
index 7de8533..c0b0967 100755
--- a/src/bin/systasksd
+++ b/src/bin/systasksd
@@ -123,7 +123,6 @@ while (true) {
if (!$res && !db_connection_status())
db_reconnect();
while ($arr = db_fetch_array($res)) {
- usergroups_sync();
$script = systask_get_script($arr['plugin_id'],
$arr['systask_type']);
if (!file_exists($script))
// Not installed on this node, skipping
@@ -137,9 +136,13 @@ while (true) {
$arr['systask_id']));
continue;
}
+
+ // Concurrency: ensure groups are activated in the system
before starting task
if (!empty($arr['group_id']) &&
!is_group_active_nocache($arr['group_id'])) {
continue; // wait until project is approved
}
+ usergroups_sync();
+
db_query_params("UPDATE systasks SET status=$1, started=now()
WHERE systask_id=$2",
array('WIP',
$arr['systask_id']));
cron_acquire_lock($script);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=538255509f003e0c4cc32cb98080cc2764edf260
commit 538255509f003e0c4cc32cb98080cc2764edf260
Author: Sylvain Beucler <[email protected]>
Date: Mon Nov 2 12:04:34 2015 +0100
debian: sync changelog
diff --git a/src/debian/changelog b/src/debian/changelog
index e098e00..9d0e4e7 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,11 +1,11 @@
fusionforge (6.0.3+20151023-1) unstable; urgency=medium
* New upstream snapshot following the 6.0 stable branch
- * Drop support for CVS (closes: #801142)
* Drop post-install scripts (closes: #789772, #789773, #793683, #801843)
* New fusionforge-plugin-projects-hierarchy package
+ * Drop support for CVS (closes: #801142)
- -- Sylvain Beucler <[email protected]> Fri, 23 Oct 2015 12:05:00 +0200
+ -- Sylvain Beucler <[email protected]> Fri, 23 Oct 2015 17:04:00 +0200
fusionforge (6.0.3-1) unstable; urgency=medium
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/bin/systasksd | 5 ++++-
src/debian/changelog | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
