[Fusionforge-commits] FusionForge branch master updated. b269c4037a42deda1427ef53e7fe96e331e1477e

Sylvain Beucler beuc-inria at fusionforge.org
Tue May 6 11:30:40 CEST 2014


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, master has been updated
       via  b269c4037a42deda1427ef53e7fe96e331e1477e (commit)
      from  57dfb8287a2c54d5dc2f1a94b321fee5573ccdd1 (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 b269c4037a42deda1427ef53e7fe96e331e1477e
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue May 6 11:30:23 2014 +0200

    scmhook: cron: issue was not a DB connection drop, simply $res being overwritten (re: e4a8df43b37e095b301d1250d363620a09736d6f)

diff --git a/src/plugins/scmhook/cronjobs/updateScmRepo.php b/src/plugins/scmhook/cronjobs/updateScmRepo.php
index 16deb5a..f2e5a19 100755
--- a/src/plugins/scmhook/cronjobs/updateScmRepo.php
+++ b/src/plugins/scmhook/cronjobs/updateScmRepo.php
@@ -50,9 +50,7 @@ if (! $res) {
 }
 
 $scmhookPlugin = new scmhookPlugin;
-$rows = array();
-while ($row = db_fetch_array($res)) $rows[] = $row;
-foreach($rows as $row) {
+while ($row = db_fetch_array($res)) {
 	$group_id = $row['group_id'];
 	$scm_box = $row['scm_box'];
 	$scmtype = '';
@@ -77,8 +75,8 @@ foreach($rows as $row) {
 			$params['hooksString'] = $row['hooks'];
 			$params['scm_root'] = forge_get_config('repos_path', 'scmsvn') . '/' . $group->getUnixName();
 			if ($scmsvncronjob->updateScmRepo($params)) {
-				$res = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
-				if (!$res) {
+				$res_update = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
+				if (!$res_update) {
 					$returnvalue = false;
 				}
 			}
@@ -93,8 +91,8 @@ foreach($rows as $row) {
 			$params['hooksString'] = $row['hooks'];
 			$params['scm_root'] = forge_get_config('repos_path', 'scmhg') . '/' . $group->getUnixName();
 			if ($scmhgcronjob->updateScmRepo($params)) {
-				$res = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
-				if (!$res) {
+				$res_update = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
+				if (!$res_update) {
 					$returnvalue = false;
 				}
 			}
@@ -109,8 +107,8 @@ foreach($rows as $row) {
 			$params['hooksString'] = $row['hooks'];
 			$params['scm_root'] = forge_get_config('repos_path', 'scmgit') . '/' . $group->getUnixName() . '/' . $group->getUnixName() . '.git' ;
 			if ($scmgitcronjob->updateScmRepo($params)) {
-				$res = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
-				if (!$res) {
+				$res_update = db_query_params('UPDATE plugin_scmhook set need_update = $1 where id_group = $2', array(0, $group_id));
+				if (!$res_update) {
 					$returnvalue = false;
 				}
 			}

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

Summary of changes:
 src/plugins/scmhook/cronjobs/updateScmRepo.php |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list