[Fusionforge-commits] FusionForge branch 6.0 updated. 6.0.4-14-gb237fad

Franck Villaume nerville at libremir.placard.fr.eu.org
Tue Jun 14 17:12:45 CEST 2016


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  b237fad31cac8f714d62feff03c3abdb1155ee84 (commit)
      from  342c31b6a96246293cd56cc4e41b15d4436a581c (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=b237fad31cac8f714d62feff03c3abdb1155ee84

commit b237fad31cac8f714d62feff03c3abdb1155ee84
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Jun 14 17:12:41 2016 +0200

    disable mediawiki. currently unmaintained plugin

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 9b5d2a1..96fa4f9 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -33,7 +33,6 @@ if [ -e /etc/debian_version ]; then
 	libapache2-mpm-itk libapache2-mod-svn \
 	apache2 postgresql libnss-pgsql2 unscd \
 	subversion viewvc python-pycurl git xinetd \
-	mediawiki \
 	python-moinmoin libapache2-mod-wsgi python-psycopg2 \
 	unoconv poppler-utils
     if ! dpkg-vendor --is Ubuntu; then
@@ -57,8 +56,5 @@ fi
         install-plugin-scmsvn install-plugin-scmgit \
         install-plugin-blocks install-plugin-moinmoin \
         install-plugin-online_help install-plugin-taskboard install-plugin-message
-    if [ -e /etc/debian_version ]; then
-	make install-plugin-mediawiki
-    fi
     make post-install
 )
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 609d3f4..39c256b 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -41,7 +41,7 @@ if [ -e /etc/debian_version ]; then
 	# Additional components for testsuite
 	$APT install fusionforge-shell fusionforge-scm \
 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn fusionforge-plugin-scmbzr \
-	    fusionforge-plugin-mediawiki fusionforge-plugin-moinmoin \
+	    fusionforge-plugin-moinmoin \
 	    fusionforge-plugin-blocks fusionforge-plugin-taskboard \
 	    fusionforge-plugin-message
 	if ! dpkg-vendor --is Ubuntu; then
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index fd9b258..ac53be7 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -29,6 +29,8 @@ class PluginMediawiki extends FForge_SeleniumTestCase
 
 	function testMediawiki()
 	{
+		$this->skip_on_src_installs();
+		$this->skip_on_deb_installs();
 		$this->skip_on_rpm_installs();
 		$this->skip_on_centos();
 

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

Summary of changes:
 autoinstall/install-src.sh                       | 4 ----
 autoinstall/install.sh                           | 2 +-
 tests/func/60_PluginsMediawiki/mediawikiTest.php | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list