| Index: branches/ariel/xmldumps-backup/worker.py |
| — | — | @@ -2750,12 +2750,12 @@ |
| 2751 | 2751 | prefetch = "--prefetch=%s" % (source) |
| 2752 | 2752 | else: |
| 2753 | 2753 | runner.showRunnerState("... building %s %s XML dump, no text prefetch..." % (self._subset, chunkinfo)) |
| 2754 | | - prefetch = None |
| | 2754 | + prefetch = "" |
| 2755 | 2755 | |
| 2756 | 2756 | if self._spawn: |
| 2757 | 2757 | spawn = "--spawn=%s" % (runner.wiki.config.php) |
| 2758 | 2758 | else: |
| 2759 | | - spawn = None |
| | 2759 | + spawn = "" |
| 2760 | 2760 | |
| 2761 | 2761 | if (not exists( runner.wiki.config.php ) ): |
| 2762 | 2762 | raise BackupError("php command %s not found" % runner.wiki.config.php) |
| — | — | @@ -2764,8 +2764,8 @@ |
| 2765 | 2765 | checkpointTime = "--maxtime=%s" % (runner.wiki.config.checkpointTime) |
| 2766 | 2766 | checkpointFile = "--checkpointfile=%s" % outputFile.newFilename(outputFile.dumpName, outputFile.fileType, outputFile.fileExt, outputFile.date, outputFile.chunk, "p%sp%s", None) |
| 2767 | 2767 | else: |
| 2768 | | - checkpointTime = None |
| 2769 | | - checkpointFile = None |
| | 2768 | + checkpointTime = "" |
| | 2769 | + checkpointFile = "" |
| 2770 | 2770 | dumpCommand = [ "%s" % runner.wiki.config.php, |
| 2771 | 2771 | "-q", "%s/maintenance/dumpTextPass.php" % runner.wiki.config.wikiDir, |
| 2772 | 2772 | "--wiki=%s" % runner.dbName, |
| — | — | @@ -2777,6 +2777,7 @@ |
| 2778 | 2778 | "--report=1000", |
| 2779 | 2779 | "%s" % spawn ] |
| 2780 | 2780 | |
| | 2781 | + dumpCommand = filter(None, dumpCommand) |
| 2781 | 2782 | command = dumpCommand |
| 2782 | 2783 | filters = self.buildFilters(runner, outputFile) |
| 2783 | 2784 | eta = self.buildEta(runner) |