ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302451
Change subject: don't use -q arg for php, we run a modern version which doesn't
need it
......................................................................
don't use -q arg for php, we run a modern version which doesn't need it
Change-Id: I117e734cd0c75b3f8d8bc02b0b10544cdfc33a22
---
M xmldumps-backup/IncrDumpLib.py
M xmldumps-backup/dumps/flowjob.py
M xmldumps-backup/dumps/utils.py
M xmldumps-backup/dumps/xmljobs.py
M xmldumps-backup/generateincrementals.py
M xmldumps-backup/onallwikis.py
M xmldumps-backup/xmlabstracts.py
M xmldumps-backup/xmllogs.py
M xmldumps-backup/xmlstubs.py
9 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/51/302451/1
diff --git a/xmldumps-backup/IncrDumpLib.py b/xmldumps-backup/IncrDumpLib.py
index 9ed5c7a..1943dde 100644
--- a/xmldumps-backup/IncrDumpLib.py
+++ b/xmldumps-backup/IncrDumpLib.py
@@ -283,7 +283,7 @@
if not exists(self.config.php):
raise BackupError("php command %s not found" % self.config.php)
command_list = MultiVersion.mw_script_as_array(self.config,
"getSlaveServer.php")
- command = [self.config.php, "-q"]
+ command = [self.config.php]
command.extend(command_list)
command.extend(["--wiki=%s" % self.wikiname, "--group=dump"])
return RunSimpleCommand.run_with_output(command, shell=False).rstrip()
diff --git a/xmldumps-backup/dumps/flowjob.py b/xmldumps-backup/dumps/flowjob.py
index 739cd68..5485e13 100644
--- a/xmldumps-backup/dumps/flowjob.py
+++ b/xmldumps-backup/dumps/flowjob.py
@@ -43,7 +43,7 @@
script_command = MultiVersion.mw_script_as_array(
runner.wiki.config, "extensions/Flow/maintenance/dumpBackup.php")
- command = ["%s" % runner.wiki.config.php, "-q"]
+ command = [runner.wiki.config.php]
command.extend(script_command)
command.extend(["--wiki=%s" % runner.db_name,
"--current", "--report=1000",
diff --git a/xmldumps-backup/dumps/utils.py b/xmldumps-backup/dumps/utils.py
index 0a33c26..8ff1670 100644
--- a/xmldumps-backup/dumps/utils.py
+++ b/xmldumps-backup/dumps/utils.py
@@ -106,7 +106,7 @@
for i in range(0, len(command_list)):
command_list[i] = MiscUtils.shell_escape(command_list[i])
command = " ".join(command_list)
- command = "%s -q %s --wiki=%s --group=dump --globals" % (php_command,
command, db_name)
+ command = "%s %s --wiki=%s --group=dump --globals" % (php_command,
command, db_name)
results = RunSimpleCommand.run_with_output(
command, shell=True, log_callback=self.error_callback).strip()
if not results:
diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py
index b06c1ba..fa7f459 100644
--- a/xmldumps-backup/dumps/xmljobs.py
+++ b/xmldumps-backup/dumps/xmljobs.py
@@ -643,7 +643,7 @@
checkpoint_time = ""
checkpoint_file = ""
script_command = MultiVersion.mw_script_as_array(runner.wiki.config,
"dumpTextPass.php")
- dump_command = ["%s" % self.wiki.config.php, "-q"]
+ dump_command = [self.wiki.config.php]
dump_command.extend(script_command)
dump_command.extend(["--wiki=%s" % runner.db_name,
"%s" % stub_option,
diff --git a/xmldumps-backup/generateincrementals.py
b/xmldumps-backup/generateincrementals.py
index 3f0aa63..b0ed11a 100644
--- a/xmldumps-backup/generateincrementals.py
+++ b/xmldumps-backup/generateincrementals.py
@@ -321,7 +321,7 @@
def dump_stub(self, start_revid, end_revid):
script_command = MultiVersion.mw_script_as_array(self._config,
"dumpBackup.php")
- command = ["%s" % self._config.php, "-q"]
+ command = [self._config.php]
command.extend(script_command)
command.extend(["--wiki=%s" % self.wikiname, "--stub", "--quiet",
"--output=gzip:%s" % self.stubfile.get_path(),
@@ -341,7 +341,7 @@
def dump_revs(self):
script_command = MultiVersion.mw_script_as_array(self._config,
"dumpTextPass.php")
- command = ["%s" % self._config.php, "-q"]
+ command = [self._config.php]
command.extend(script_command)
command.extend(["--wiki=%s" % self.wikiname,
"--stub=gzip:%s" % self.stubfile.get_path(),
diff --git a/xmldumps-backup/onallwikis.py b/xmldumps-backup/onallwikis.py
index af286fe..10f849c 100644
--- a/xmldumps-backup/onallwikis.py
+++ b/xmldumps-backup/onallwikis.py
@@ -73,7 +73,7 @@
if self.scriptname.endswith('.php'):
script_command = MultiVersion.mw_script_as_array(
base.config, self.scriptname)
- script_command = [base.config.php, "-q"] + script_command
+ script_command = [base.config.php] + script_command
script_command.extend(["--wiki", base.db_name])
else:
script_command = [self.scriptname]
diff --git a/xmldumps-backup/xmlabstracts.py b/xmldumps-backup/xmlabstracts.py
index 356695b..441868c 100644
--- a/xmldumps-backup/xmlabstracts.py
+++ b/xmldumps-backup/xmlabstracts.py
@@ -39,7 +39,7 @@
script_command = MultiVersion.mw_script_as_array(wikiconf,
"dumpBackup.php")
- command = [wikiconf.php, "-q"] + script_command
+ command = [wikiconf.php] + script_command
version = MultiVersion.mw_version(wikiconf, wikidb)
abstract_cmd_dir = wikiconf.wiki_dir
if version:
diff --git a/xmldumps-backup/xmllogs.py b/xmldumps-backup/xmllogs.py
index 10973ee..547d7bf 100644
--- a/xmldumps-backup/xmllogs.py
+++ b/xmldumps-backup/xmllogs.py
@@ -32,7 +32,7 @@
outfiles[filetype]['compr'] = gzippit(outfiles[filetype]['name'])
script_command = MultiVersion.mw_script_as_array(wikiconf,
"dumpBackup.php")
- command = [wikiconf.php, "-q"] + script_command
+ command = [wikiconf.php] + script_command
command.extend(["--wiki=%s" % wikidb,
"--logs", "--report=1000",
diff --git a/xmldumps-backup/xmlstubs.py b/xmldumps-backup/xmlstubs.py
index 391e450..1467866 100644
--- a/xmldumps-backup/xmlstubs.py
+++ b/xmldumps-backup/xmlstubs.py
@@ -116,7 +116,7 @@
outfiles[filetype]['compr'] = gzippit(outfiles[filetype]['name'])
script_command = MultiVersion.mw_script_as_array(wikiconf,
"dumpBackup.php")
- command = [wikiconf.php, "-q"] + script_command
+ command = [wikiconf.php] + script_command
command.extend(["--wiki=%s" % wikidb,
"--full", "--stub", "--report=1000",
--
To view, visit https://gerrit.wikimedia.org/r/302451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I117e734cd0c75b3f8d8bc02b0b10544cdfc33a22
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
