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, Branch_5_3 has been updated
via 42125c8fa7328c7733f6585dd8b241148d7e1d9b (commit)
via 777a8957247c8fce0e62e3dc5f58d55eea20c9c0 (commit)
from e0a01e7825693b386e27f0aae9eb7a24e12e78a8 (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 42125c8fa7328c7733f6585dd8b241148d7e1d9b
Author: Sylvain Beucler <[email protected]>
Date: Mon May 26 14:44:16 2014 +0200
scmsvn: abort on DB error (don't write a corrupt svnroot-access) - fixes
[#678]
diff --git a/src/common/include/RBACEngine.class.php
b/src/common/include/RBACEngine.class.php
index 2e69649..3c08b70 100644
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@ -241,6 +241,8 @@ class RBACEngine extends Error implements PFO_RBACEngine {
public function getUsersByAllowedAction ($section, $reference, $action
= NULL) {
$roles = $this->getRolesByAllowedAction ($section, $reference,
$action);
+ if ($roles === false) // Error
+ return false;
$user_ids = array ();
foreach ($roles as $role) {
foreach ($role->getUsers() as $user) {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index f67e06c..9eaa157 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -329,7 +329,7 @@ class SVNPlugin extends SCMPlugin {
}
}
- function updateRepositoryList($params) {
+ function updateRepositoryList(&$params) {
$groups = $this->getGroups();
// Update WebDAV stuff
@@ -352,6 +352,10 @@ class SVNPlugin extends SCMPlugin {
$access_data .= '[' . $project->getUnixName() . ":/]\n";
$users =
$engine->getUsersByAllowedAction('scm',$project->getID(),'read');
+ if ($users === false) {
+ $params['output'] .= $engine->getErrorMessage();
+ return false;
+ }
foreach ($users as $user) {
$svnusers[$user->getID()] = $user;
if (forge_check_perm_for_user($user,
commit 777a8957247c8fce0e62e3dc5f58d55eea20c9c0
Author: Sylvain Beucler <[email protected]>
Date: Mon May 26 14:43:19 2014 +0200
scmsvn: packaging: don't create empty cronjobs/
diff --git a/src/plugins/scmsvn/packaging/dirs/plugin-scmsvn
b/src/plugins/scmsvn/packaging/dirs/plugin-scmsvn
index 3bcf24f..869c659 100644
--- a/src/plugins/scmsvn/packaging/dirs/plugin-scmsvn
+++ b/src/plugins/scmsvn/packaging/dirs/plugin-scmsvn
@@ -1,5 +1,4 @@
@PLUGIN_PATH@/scmsvn/bin
-@PLUGIN_PATH@/scmsvn/cronjobs
@PLUGIN_PATH@/scmsvn/common
@DATA_PATH@/chroot/scmrepos/svn
@DATA_PATH@/dumps
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBACEngine.class.php | 2 ++
src/plugins/scmsvn/common/SVNPlugin.class.php | 6 +++++-
src/plugins/scmsvn/packaging/dirs/plugin-scmsvn | 1 -
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
