https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115129
Revision: 115129
Author: reedy
Date: 2012-05-03 14:57:03 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Update checkoutMediaWiki to give a correct version of LocalSettings that
doesn't break job runners
Modified Paths:
--------------
trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
===================================================================
--- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-05-03
14:50:39 UTC (rev 115128)
+++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-05-03
14:57:03 UTC (rev 115129)
@@ -67,7 +67,12 @@
<?php
# WARNING: This file is publically viewable on the web. Do not put private
data here.
if ( defined('TESTWIKI') ) {
- include_once( "/home/wikipedia/common/wmf-config/CommonSettings.php" );
+ if( ( isset($maintClass) && $maintClass === 'RunJobs' ) ||
!file_exists( "/home/wikipedia" ) ) {
+ # Jobs runner on apache do not have a /home/wikipedia !
+ include_once( "/apache/common/wmf-config/CommonSettings.php" );
+ } else {
+ include_once(
"/home/wikipedia/common/wmf-config/CommonSettings.php" );
+ }
} else {
include_once( "/apache/common/wmf-config/CommonSettings.php" );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
