[Fusionforge-commits] FusionForge branch master updated. c168d5246696d2ed41cbff4ab44c876a02e0b3b8

Franck VILLAUME nerville at fusionforge.org
Mon Jun 24 23:15:02 CEST 2013


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  c168d5246696d2ed41cbff4ab44c876a02e0b3b8 (commit)
       via  fa5c013faf4f474add347941e6fc7ccc45cee14d (commit)
      from  05fd7a838bab92c52556a6ef4952a6204fd18ee3 (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 c168d5246696d2ed41cbff4ab44c876a02e0b3b8
Merge: 05fd7a8 fa5c013
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jun 24 23:13:35 2013 +0200

    Merge remote-tracking branch 'nerville/master'


commit fa5c013faf4f474add347941e6fc7ccc45cee14d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jun 24 23:05:24 2013 +0200

    scmhook: check if scmhook is installed

diff --git a/src/db/20130531-svntrackerToScmhookCommitTrackerMigration.php b/src/db/20130531-svntrackerToScmhookCommitTrackerMigration.php
index ff9a6d1..0935812 100644
--- a/src/db/20130531-svntrackerToScmhookCommitTrackerMigration.php
+++ b/src/db/20130531-svntrackerToScmhookCommitTrackerMigration.php
@@ -24,7 +24,6 @@
 
 require_once dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
-require_once $gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php';
 
 $pm = plugin_manager_get_object();
 
@@ -39,6 +38,11 @@ if ($groupnames) {
 }
 
 if ($used) {
+	if (!is_readable($gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php')) {
+		echo "FAILED: scmhook is missing. Please install scmhook plugin and rerun the migration script\n";
+		exit(1);
+	}
+	require_once $gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php';
 	// is scmhook activated ?
 	// no ... -> activate the plugin
 	if (!$pm->PluginIsInstalled('scmhook')) {
diff --git a/src/db/20130602-svncommitemailToScmHookCommitEmailMigration.php b/src/db/20130602-svncommitemailToScmHookCommitEmailMigration.php
index 6f3fc37..1393931 100644
--- a/src/db/20130602-svncommitemailToScmHookCommitEmailMigration.php
+++ b/src/db/20130602-svncommitemailToScmHookCommitEmailMigration.php
@@ -24,10 +24,9 @@
 
 require_once dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
-require_once $gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php';
 
-$pm = plugin_manager_get_object();
 
+$pm = plugin_manager_get_object();
 
 $used = false;
 $groupnames = db_query_params('SELECT g.group_name FROM plugins p, group_plugin gp, groups g WHERE plugin_name = $1 and gp.group_id = g.group_id and p.plugin_id = gp.plugin_id',
@@ -40,6 +39,11 @@ if ($groupnames) {
 }
 
 if ($used) {
+	if (!is_readable($gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php')) {
+		echo "FAILED: scmhook plugin is missing. Please install scmhook plugin and rerun the migration script.\n";
+		exit(1);
+	}
+	require_once $gfplugins.'scmhook/library/scmsvn/cronjobs/updateScmRepo.php';
 	// is scmhook activated ?
 	// no ... -> activate the plugin
 	if (!$pm->PluginIsInstalled('scmhook')) {

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

Summary of changes:
 src/db/20130531-svntrackerToScmhookCommitTrackerMigration.php  |    6 +++++-
 .../20130602-svncommitemailToScmHookCommitEmailMigration.php   |    8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list