http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95810
Revision: 95810
Author: demon
Date: 2011-08-30 20:45:36 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Remove wfDie() that Ariel keeps trying to resurrect :)
Modified Paths:
--------------
trunk/phase3/maintenance/dumpTextPass.php
Modified: trunk/phase3/maintenance/dumpTextPass.php
===================================================================
--- trunk/phase3/maintenance/dumpTextPass.php 2011-08-30 20:44:33 UTC (rev
95809)
+++ trunk/phase3/maintenance/dumpTextPass.php 2011-08-30 20:45:36 UTC (rev
95810)
@@ -96,7 +96,7 @@
$result = $this->readDump( $input );
if ( WikiError::isError( $result ) ) {
- wfDie( $result->getMessage() );
+ throw new MWException( $result->getMessage() );
}
if ( $this->spawnProc ) {
@@ -236,12 +236,12 @@
function finalOptionCheck() {
if (($this->checkpointFiles && ! $this->maxTimeAllowed) ||
($this->maxTimeAllowed && !$this->checkpointFiles)) {
- wfDie("Options checkpointfile and maxtime must be
specified together.\n");
+ throw new MWException("Options checkpointfile and
maxtime must be specified together.\n");
}
foreach ($this->checkpointFiles as $checkpointFile) {
$count = substr_count ($checkpointFile,"%s");
if (substr_count ($checkpointFile,"%s") != 2) {
- wfDie("Option checkpointfile must contain two
'%s' for substitution of first and last pageids, count is $count instead, file
is $checkpointFile.\n");
+ throw new MWException("Option checkpointfile
must contain two '%s' for substitution of first and last pageids, count is
$count instead, file is $checkpointFile.\n");
}
}
@@ -251,7 +251,7 @@
$filenameList = array( $filenameList );
}
if (count($filenameList) !=
count($this->checkpointFiles)) {
- wfDie("One checkpointfile must be specified for
each output option, if maxtime is used.\n");
+ throw new MWException("One checkpointfile must
be specified for each output option, if maxtime is used.\n");
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
