From 63e31a6de47aced1234143770ad596fe600d3fbe Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Mon, 24 Apr 2023 21:16:48 +0000 Subject: [PATCH] upgrade-zulip-from-git: CWD will be the cache directory. 96e42b8e811f broke this when it split out the steps to reset the upstream. --- scripts/lib/upgrade-zulip-from-git | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/upgrade-zulip-from-git b/scripts/lib/upgrade-zulip-from-git index 48bd8527a4..4fa8a44061 100755 --- a/scripts/lib/upgrade-zulip-from-git +++ b/scripts/lib/upgrade-zulip-from-git @@ -16,6 +16,7 @@ from scripts.lib.zulip_tools import ( get_config, get_config_file, get_deploy_options, + get_deploy_root, get_deployment_lock, make_deploy_path, overwrite_symlink, @@ -133,7 +134,9 @@ try: preexec_fn=su_to_zulip, ) - subprocess.check_call(["./scripts/lib/update-git-upstream"], preexec_fn=su_to_zulip) + subprocess.check_call( + [os.path.join(get_deploy_root(), "scripts/lib/update-git-upstream")], preexec_fn=su_to_zulip + ) # Generate the deployment directory via git worktree from our local repository. try: