ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398637 )
Change subject: Revert "use cat to recombine gzipped files together"
......................................................................
Revert "use cat to recombine gzipped files together"
This reverts commit faf7de86d3dd98b4e5bd59809c5938050fbec42d.
A nice idea but we would wind up with multiple site headers in the concatenated
file, changing the contents.
Change-Id: I7da9a95c0c817b529f40ce024235c1afbe85600f
---
M xmldumps-backup/dumps/recombinejobs.py
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmldumps-backup/dumps/recombinejobs.py
b/xmldumps-backup/dumps/recombinejobs.py
index ce5e580..12c49e5 100644
--- a/xmldumps-backup/dumps/recombinejobs.py
+++ b/xmldumps-backup/dumps/recombinejobs.py
@@ -129,11 +129,11 @@
if not len(input_dfnames):
self.set_status("failed")
raise BackupError("No input files for %s found" % self.name())
- if not exists(runner.wiki.config.cat):
- raise BackupError("cat command %s not found" %
runner.wiki.config.cat)
- compression_command = runner.wiki.config.cat
- compression_command = "%s > " % runner.wiki.config.cat
- uncompression_command = ["%s" % runner.wiki.config.cat]
+ if not exists(runner.wiki.config.gzip):
+ raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
+ compression_command = runner.wiki.config.gzip
+ compression_command = "%s > " % runner.wiki.config.gzip
+ uncompression_command = ["%s" % runner.wiki.config.gzip, "-dc"]
recombine_command_string = self.build_recombine_command_string(
runner, input_dfnames, output_dfname, compression_command,
uncompression_command)
recombine_command = [recombine_command_string]
@@ -301,10 +301,10 @@
if not len(input_dfnames):
self.set_status("failed")
raise BackupError("No input files for %s found" % self.name())
- if not exists(runner.wiki.config.cat):
- raise BackupError("cat command %s not found" %
runner.wiki.config.cat)
- compression_command = "%s > " % runner.wiki.config.cat
- uncompression_command = ["%s" % runner.wiki.config.cat]
+ if not exists(runner.wiki.config.gzip):
+ raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
+ compression_command = "%s > " % runner.wiki.config.gzip
+ uncompression_command = ["%s" % runner.wiki.config.gzip, "-dc"]
recombine_command_string = self.build_recombine_command_string(
runner, input_dfnames, output_dfname, compression_command,
uncompression_command, "<feed>")
--
To view, visit https://gerrit.wikimedia.org/r/398637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7da9a95c0c817b529f40ce024235c1afbe85600f
Gerrit-PatchSet: 2
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
