http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95639
Revision: 95639
Author: ariel
Date: 2011-08-28 22:15:58 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
lose empty options from dumpTextPass runs
Modified Paths:
--------------
branches/ariel/xmldumps-backup/worker.py
Modified: branches/ariel/xmldumps-backup/worker.py
===================================================================
--- branches/ariel/xmldumps-backup/worker.py 2011-08-28 22:04:49 UTC (rev
95638)
+++ branches/ariel/xmldumps-backup/worker.py 2011-08-28 22:15:58 UTC (rev
95639)
@@ -2750,12 +2750,12 @@
prefetch = "--prefetch=%s" % (source)
else:
runner.showRunnerState("... building %s %s XML dump, no
text prefetch..." % (self._subset, chunkinfo))
- prefetch = None
+ prefetch = ""
if self._spawn:
spawn = "--spawn=%s" % (runner.wiki.config.php)
else:
- spawn = None
+ spawn = ""
if (not exists( runner.wiki.config.php ) ):
raise BackupError("php command %s not found" %
runner.wiki.config.php)
@@ -2764,8 +2764,8 @@
checkpointTime = "--maxtime=%s" %
(runner.wiki.config.checkpointTime)
checkpointFile = "--checkpointfile=%s" %
outputFile.newFilename(outputFile.dumpName, outputFile.fileType,
outputFile.fileExt, outputFile.date, outputFile.chunk, "p%sp%s", None)
else:
- checkpointTime = None
- checkpointFile = None
+ checkpointTime = ""
+ checkpointFile = ""
dumpCommand = [ "%s" % runner.wiki.config.php,
"-q", "%s/maintenance/dumpTextPass.php" %
runner.wiki.config.wikiDir,
"--wiki=%s" % runner.dbName,
@@ -2777,6 +2777,7 @@
"--report=1000",
"%s" % spawn ]
+ dumpCommand = filter(None, dumpCommand)
command = dumpCommand
filters = self.buildFilters(runner, outputFile)
eta = self.buildEta(runner)
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
