restore-backup: Switch to run() to check exit codes.

This commit is contained in:
Alex Vandiver 2022-06-09 11:51:57 -07:00 committed by Tim Abbott
parent c71c6187ea
commit 1b57669771
1 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
# next). Ignore errors if zulip-backup/settings is not present # next). Ignore errors if zulip-backup/settings is not present
# (E.g. because this is a development backup). # (E.g. because this is a development backup).
tarball_file.seek(0, 0) tarball_file.seek(0, 0)
subprocess.call( run(
["tar", "--directory=/etc/zulip", "--strip-components=2", "-xz", "zulip-backup/settings"], ["tar", "--directory=/etc/zulip", "--strip-components=2", "-xz", "zulip-backup/settings"],
stdin=tarball_file, stdin=tarball_file,
) )
@ -107,7 +107,7 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
if settings.PRODUCTION: if settings.PRODUCTION:
# In case we are restoring a backup from an older Zulip # In case we are restoring a backup from an older Zulip
# version, there may be new secrets to generate. # version, there may be new secrets to generate.
subprocess.check_call( run(
[ [
os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "generate_secrets.py"), os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "generate_secrets.py"),
"--production", "--production",