paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

provision: Rename install_apt_deps to a more generic install_system_deps.

Browse Source
This commit is contained in:
rht
2018-12-16 19:45:29 +00:00
committed by Tim Abbott
parent 389c46b4e5
commit c6cde1cf5c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lib/provision.py
View File

@@ -230,7 +230,7 @@ def setup_shell_profile(shell_profile):
write_command(source_activate_command) write_command(source_activate_command)
write_command('cd /srv/zulip') write_command('cd /srv/zulip')
def install_apt_deps(): def install_system_deps():
# type: () -> None # type: () -> None
if vendor == 'CentOS': if vendor == 'CentOS':
install_yum_deps() install_yum_deps()
@@ -286,9 +286,9 @@ def main(options):
if (new_apt_dependencies_hash != last_apt_dependencies_hash): if (new_apt_dependencies_hash != last_apt_dependencies_hash):
try: try:
install_apt_deps() install_system_deps()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# TODO: Remove this when we split install_apt_deps. # TODO: Make CentOS have similar retry behavior to apt here.
if vendor == 'CentOS': if vendor == 'CentOS':
traceback.print_exc() traceback.print_exc()
exit(1) exit(1)
@@ -300,7 +300,7 @@ def main(options):
# is out of date, we run it explicitly here so that we # is out of date, we run it explicitly here so that we
# recover automatically. # recover automatically.
run(['sudo', 'apt-get', 'update']) run(['sudo', 'apt-get', 'update'])
install_apt_deps() install_system_deps()
with open(apt_hash_file_path, 'w') as hash_file: with open(apt_hash_file_path, 'w') as hash_file:
hash_file.write(new_apt_dependencies_hash) hash_file.write(new_apt_dependencies_hash)
else: else: