* Suppress 7za output on dumpBackup

keeps appending crap to output which obscures other info

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fb36547..6396481 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -153,6 +153,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5516) Show appropriate "return to" link on blocked page
 * (bug 5377) Do not auto-login when creating an account as another user
 * (bug 5284) Special redirect pages should remember parameters
+* Suppress 7za output on dumpBackup
+
 
 == Compatibility ==
 

diff --git a/includes/Export.php b/includes/Export.php
index 6a8e219..d0253eb 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -528,6 +528,9 @@ class DumpBZip2Output extends DumpPipeOutput {
 class Dump7ZipOutput extends DumpPipeOutput {
        function Dump7ZipOutput( $file ) {
                $command = "7za a -bd -si " . wfEscapeShellArg( $file );
+               // Suppress annoying useless crap from p7zip
+               // Unfortunately this could suppress real error messages too
+               $command .= " >/dev/null 2>&1";
                parent::DumpPipeOutput( $command );
        }
 }