https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115467
Revision: 115467
Author: aaron
Date: 2012-05-31 23:06:34 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Moved is_dir() sanity check to refresh script; it cannot run on the apaches.
Modified Paths:
--------------
trunk/tools/mwmultiversion/multiversion/MWWikiversions.php
trunk/tools/mwmultiversion/multiversion/refreshWikiversionsCDB
Modified: trunk/tools/mwmultiversion/multiversion/MWWikiversions.php
===================================================================
--- trunk/tools/mwmultiversion/multiversion/MWWikiversions.php 2012-05-31
20:22:52 UTC (rev 115466)
+++ trunk/tools/mwmultiversion/multiversion/MWWikiversions.php 2012-05-31
23:06:34 UTC (rev 115467)
@@ -56,12 +56,6 @@
throw new Exception( "Invalid row on line $lineNo
('$line').\n" );
}
- // Sanity check version directory
- $versionDir = MULTIVER_COMMON_HOME . '/' . $version ;
- if ( !is_dir( $versionDir ) ) {
- throw new Exception( "Invalid version dir '$versionDir'
on line $lineNo ('$line').\n" );
- }
-
return array( $dbName, $version, $extVersion, $comment );
}
Modified: trunk/tools/mwmultiversion/multiversion/refreshWikiversionsCDB
===================================================================
--- trunk/tools/mwmultiversion/multiversion/refreshWikiversionsCDB
2012-05-31 20:22:52 UTC (rev 115466)
+++ trunk/tools/mwmultiversion/multiversion/refreshWikiversionsCDB
2012-05-31 23:06:34 UTC (rev 115467)
@@ -15,6 +15,14 @@
// Get the array of sanitized wikiversion rows...
$rows = MWWikiversions::readWikiVersionsFile( $srcPath );
+ // Sanity check version directories...
+ foreach ( $rows as $row ) {
+ list( $dbName, $version, $extVersion, $comment ) = $row;
+ $versionDir = MULTIVER_COMMON_HOME . '/' . $version;
+ if ( !is_dir( $versionDir ) ) {
+ die( "Invalid version dir '$versionDir' for wiki
'$dbName'.\n" );
+ }
+ }
// Make sure all wikis have an entry...
$dbNamesWithRows = array();
foreach ( $rows as $row ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
