Skip to content

Commit

Permalink
Tell dumpTextPass to use dbzip2 only if we've been configured for it;…
Browse files Browse the repository at this point in the history
… otherwise use regular bzip2

git-svn-id: file:///home/git-svn-mirror/pushmi-svn-mirror/trunk@33005 dd0e9695-b195-4be7-bd10-2dea1a65a6b6
  • Loading branch information
brion committed Apr 9, 2008
1 parent a7047ae commit 36ecf41
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion backup/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,11 @@ def buildEta(self, runner):
def buildFilters(self, runner):
"""Construct the output filter options for dumpTextPass.php"""
xmlbz2 = self._path(runner, "bz2")
return "--output=dbzip2:%s" % shellEscape(xmlbz2)
if runner.config.bzip2[-6:] == "dbzip2":
bz2mode = "dbzip2"
else:
bz2mode = "bzip2"
return "--output=%s:%s" % shellEscape(bz2mode, xmlbz2)

def buildCommand(self, runner):
"""Build the command line for the dump, minus output and filter options"""
Expand Down

0 comments on commit 36ecf41

Please sign in to comment.