From 1d9dd966b182183f68792bb5cd4c1f194b7a3126 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 10 Jul 2020 10:07:22 +0530 Subject: [PATCH] fix: pipe uncompressed database to file Signed-off-by: Chinmay D. Pai --- build/common/commands/restore_backup.py | 13 ++++++------- build/common/commands/utils.py | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index 79d4ea0a..ecb2e24d 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -29,18 +29,17 @@ def get_backup_dir(): ) -def decompress_db(files_base, site): - database_file = files_base + '-database.sql.gz' - command = ["gunzip", "-c", database_file, ">", database_file.replace(".gz", "")] - - print('Extract Database GZip for site {}'.format(site)) - run_command(command) +def decompress_db(database_file, site): + command = ["gunzip", "-c", database_file] + with open(database_file.replace(".gz", ""), "w") as db_file: + print('Extract Database GZip for site {}'.format(site)) + run_command(command, stdout=db_file) def restore_database(files_base, site_config_path, site): # restore database database_file = files_base + '-database.sql.gz' - decompress_db(files_base, site) + decompress_db(database_file, site) config = get_config() # Set db_type if it exists in backup site_config.json diff --git a/build/common/commands/utils.py b/build/common/commands/utils.py index d9535c6b..d962fbd5 100644 --- a/build/common/commands/utils.py +++ b/build/common/commands/utils.py @@ -1,8 +1,10 @@ import subprocess -def run_command(command): - process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +def run_command(command, stdout=None, stderr=None): + stdout = stdout or subprocess.PIPE + stderr = stderr or subprocess.PIPE + process = subprocess.Popen(command, stdout=stdout, stderr=stderr) out, error = process.communicate() if process.returncode: print("Something went wrong:")