[Fusionforge-commits] FusionForge branch Branch_5_1 updated. 14f31c3d417f3fbc143c940cc88967467f860288

Thorsten Glaser mirabilos at fusionforge.org
Fri Jan 9 14:26:29 CET 2015


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_1 has been updated
       via  14f31c3d417f3fbc143c940cc88967467f860288 (commit)
       via  ea43cf19adbb4b6bf5037765cf33305f7f17e639 (commit)
      from  a7d48bfdf710c147e32670473e593ad0467376bf (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 14f31c3d417f3fbc143c940cc88967467f860288
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Jan 9 14:25:33 2015 +0100

    add checks for usesPlugin to mw-full{dump,restore}
    
    not to cronjobs/create-*.php as they operate on the right set of
    groups already; not to mw-drop-wikis.php as it’s safe to use if
    usesPlugin is disabled… probably the default case there, even

diff --git a/src/plugins/mediawiki/bin/mw-fulldump b/src/plugins/mediawiki/bin/mw-fulldump
index 2ed27b5..08b35e5 100644
--- a/src/plugins/mediawiki/bin/mw-fulldump
+++ b/src/plugins/mediawiki/bin/mw-fulldump
@@ -2,7 +2,7 @@
 #-
 # MediaWiki Plugin full dump/restore for FusionForge
 #
-# Copyright © 2013
+# Copyright © 2013, 2015
 #	Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
 # All rights reserved.
 #
@@ -31,6 +31,10 @@ if [[ $# != 1 || $1 = *@([	 ])* || -e $1.fulldump || \
 	exit 255
 fi
 
+# check if project uses Wiki at all
+/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+    showStats.php >/dev/null || exit $?
+
 wd=$PWD
 set -x
 set -e
diff --git a/src/plugins/mediawiki/bin/mw-fullrestore b/src/plugins/mediawiki/bin/mw-fullrestore
index 6d2f005..906556a 100644
--- a/src/plugins/mediawiki/bin/mw-fullrestore
+++ b/src/plugins/mediawiki/bin/mw-fullrestore
@@ -2,7 +2,7 @@
 #-
 # MediaWiki Plugin full dump/restore for FusionForge
 #
-# Copyright © 2013
+# Copyright © 2013, 2015
 #	Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
 # All rights reserved.
 #
@@ -33,6 +33,10 @@ if [[ $# != 2 || $1 = *@([       ])* || ! -s $2 || \
 	exit 255
 fi
 
+# check if project uses Wiki at all
+/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+    showStats.php >/dev/null || exit $?
+
 set -x
 set -e
 rm -rf "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"

commit ea43cf19adbb4b6bf5037765cf33305f7f17e639
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Jan 9 14:20:25 2015 +0100

    exit 1 in case of any trouble

diff --git a/src/plugins/mediawiki/bin/mw-wrapper.php b/src/plugins/mediawiki/bin/mw-wrapper.php
index b89c878..eaa51af 100644
--- a/src/plugins/mediawiki/bin/mw-wrapper.php
+++ b/src/plugins/mediawiki/bin/mw-wrapper.php
@@ -5,8 +5,8 @@
  *
  * Copyright © 2010
  *	Roland Mas
- * Copyright © 2012, 2014
- *	Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright © 2012, 2014, 2015
+ *	Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
  * All rights reserved.
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -51,12 +51,14 @@ setup_plugin_manager () ;
 
 $group = group_get_object_by_name($fusionforgeproject) ;
 if (!$group || $group->isError()) {
-	die("Wrong group! " .
+	fwrite(STDERR, "Wrong group! " .
 	    ($group ? $group->getErrorMessage() : "") . "\n");
+	exit(1);
 }
 
 if (!$group->usesPlugin('mediawiki')) {
-	die ("Project doesn't use the Mediawiki plugin\n") ;
+	fwrite(STDERR, "Project doesn't use the Mediawiki plugin\n");
+	exit(1);
 }
 
 function ffmw_wrapper_fixup_searchpath($username) {
diff --git a/src/plugins/mediawiki/www/LocalSettings.php b/src/plugins/mediawiki/www/LocalSettings.php
index ef71a5d..b0004ec 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -53,7 +53,8 @@ $project_dir = forge_get_config('projects_path', 'mediawiki') . "/"
 	. $fusionforgeproject ;
 
 if (!is_dir($project_dir)) {
-	exit_error (sprintf(_('Mediawiki for project %s not created yet, please wait for a few minutes.'), $fusionforgeproject)) ;
+	fprintf(STDERR, _('Mediawiki for project %s not created yet, please wait for a few minutes.'), $fusionforgeproject);
+	exit(1);
 }
 
 
@@ -64,13 +65,15 @@ require_once( "$IP/includes/DefaultSettings.php" );
 
 if ( $wgCommandLineMode ) {
         if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
-                die( "This script must be run from the command line\n" );
+                fwrite(STDERR, "This script must be run from the command line\n");
+		exit(1);
         }
 }
 $g = group_get_object_by_name($fusionforgeproject) ;
 $group_id = $g->getID();
 if (!$g->usesPlugin('mediawiki')) {
-	exit_error(sprintf(_('Project %s does not use the Mediawiki plugin'), $fusionforgeproject));
+	fprintf(STDERR, _('Project %s does not use the Mediawiki plugin'), $fusionforgeproject);
+	exit(1);
 }
 $wgSitename         = $g->getPublicName() . " Wiki";
 $wgScriptPath       = "/plugins/mediawiki/wiki/$fusionforgeproject" ;

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

Summary of changes:
 src/plugins/mediawiki/bin/mw-fulldump       |    6 +++++-
 src/plugins/mediawiki/bin/mw-fullrestore    |    6 +++++-
 src/plugins/mediawiki/bin/mw-wrapper.php    |   10 ++++++----
 src/plugins/mediawiki/www/LocalSettings.php |    9 ++++++---
 4 files changed, 22 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list