From cbd499b538c23b92e5198572b6967204323956a4 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 30 Aug 2011 20:45:36 +0000 Subject: [PATCH] Remove wfDie() that Ariel keeps trying to resurrect :) --- maintenance/dumpTextPass.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index a000385941..51d3bf9b25 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -96,7 +96,7 @@ class TextPassDumper extends BackupDumper { $result = $this->readDump( $input ); if ( WikiError::isError( $result ) ) { - wfDie( $result->getMessage() ); + throw new MWException( $result->getMessage() ); } if ( $this->spawnProc ) { @@ -236,12 +236,12 @@ class TextPassDumper extends BackupDumper { 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 @@ class TextPassDumper extends BackupDumper { $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"); } } } -- 2.20.1