From b6a6354676cf945beca9e8cd89982af631a8df83 Mon Sep 17 00:00:00 2001 From: Ariel Glenn Date: Tue, 23 Aug 2011 00:04:45 +0000 Subject: [PATCH] fix a couple bad lines in previous commit from bad merge attempt --- maintenance/dumpTextPass.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 1e3d6cac78..0ece9713f3 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -222,7 +222,6 @@ class TextPassDumper extends BackupDumper { $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]",- $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) ); $this->lastTime = $now; - $this->partCountLast = $this->partCount; $this->revCountLast = $this->revCount; $this->prefetchCountLast = $this->prefetchCount; $this->fetchCountLast = $this->fetchCount; @@ -248,8 +247,7 @@ class TextPassDumper extends BackupDumper { 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, fil -e is $checkpointFile.\n"); + wfDie("Option checkpointfile must contain two '%s' for substitution of first and last pageids, count is $count instead, file is $checkpointFile.\n"); } } -- 2.20.1