r95288 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95287‎ | r95288 | r95289 >
Date:00:04, 23 August 2011
Author:ariel
Status:ok
Tags:
Comment:
fix a couple bad lines in previous commit from bad merge attempt
Modified paths:
  • /trunk/phase3/maintenance/dumpTextPass.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/dumpTextPass.php
@@ -222,7 +222,6 @@
223223 $this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), %d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% prefetched (all|curr), ETA %s [max %d]",-
224224 $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) );
225225 $this->lastTime = $now;
226 - $this->partCountLast = $this->partCount;
227226 $this->revCountLast = $this->revCount;
228227 $this->prefetchCountLast = $this->prefetchCount;
229228 $this->fetchCountLast = $this->fetchCount;
@@ -248,8 +247,7 @@
249248 foreach ($this->checkpointFiles as $checkpointFile) {
250249 $count = substr_count ($checkpointFile,"%s");
251250 if (substr_count ($checkpointFile,"%s") != 2) {
252 - wfDie("Option checkpointfile must contain two '%s' for substitution of first and last pageids, count is $count instead, fil
253 -e is $checkpointFile.\n");
 251+ wfDie("Option checkpointfile must contain two '%s' for substitution of first and last pageids, count is $count instead, file is $checkpointFile.\n");
254252 }
255253 }
256254

Follow-up revisions

RevisionCommit summaryAuthorDate
r96556MFT r95260, r95272, r95288, r95290, r95443, r95601, r95604, r95634, r95720, r...reedy12:28, 8 September 2011

Status & tagging log