From 2dc1dc8ec228c25b09bd4fb2329a927d9b91df74 Mon Sep 17 00:00:00 2001 From: rht Date: Sun, 16 Dec 2018 22:24:05 +0000 Subject: [PATCH] provision: Replace overwrite_symlink with `sudo ln -sf`. overwrite_symlink doesn't work for a non-root user when accessing root content. --- tools/lib/provision.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 9498efb3f1..b504094d26 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -15,8 +15,7 @@ ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__f sys.path.append(ZULIP_PATH) from scripts.lib.zulip_tools import run, subprocess_text_output, OKBLUE, ENDC, WARNING, \ - get_dev_uuid_var_path, FAIL, parse_lsb_release, file_or_package_hash_updated, \ - overwrite_symlink + get_dev_uuid_var_path, FAIL, parse_lsb_release, file_or_package_hash_updated from scripts.lib.setup_venv import ( setup_virtualenv, VENV_DEPENDENCIES, YUM_VENV_DEPENDENCIES, THUMBOR_VENV_DEPENDENCIES, YUM_THUMBOR_VENV_DEPENDENCIES @@ -272,8 +271,8 @@ def install_yum_deps(deps_to_install, retry=False): # Our tooling expects these postgres scripts to be at # well-known paths. There's an argument for eventually # making our tooling auto-detect, but this is simpler. - overwrite_symlink("/usr/%s/bin/%s" % (postgres_dir, cmd), - "/usr/bin/%s" % (cmd,)) + run(["sudo", "ln", "-nsf", "/usr/%s/bin/%s" % (postgres_dir, cmd), + "/usr/bin/%s" % (cmd,)]) # Compile tsearch-extras from scratch run(["sudo", "./scripts/lib/build-tsearch-extras"]) run(["sudo", "-H", "/usr/%s/bin/postgresql-%s-setup" % (postgres_dir, POSTGRES_VERSION), "initdb"])