From 7437079302fe8fbacd828a352d44650e395185eb Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:21:28 +0100 Subject: [PATCH] Prefer .meta.json to .build-hash --- alibuild_helpers/sync.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alibuild_helpers/sync.py b/alibuild_helpers/sync.py index 0ad679e1..16c4468a 100644 --- a/alibuild_helpers/sync.py +++ b/alibuild_helpers/sync.py @@ -349,7 +349,8 @@ def fetch_symlinks(self, spec): for install_path in $(find "{remote_store}/{cvmfs_architecture}/Packages/{package}" -type d -mindepth 1 -maxdepth 1); do full_version="${{install_path##*/}}" tarball={package}-$full_version.{architecture}.tar.gz - pkg_hash=$(cat "${{install_path}}/.build-hash" || jq -r '.package.hash' <${{install_path}}/.meta.json) + # Apparently .build-hash and .meta.json track two different things + pkg_hash=$(jq -r '.package.hash' <${{install_path}}/.meta.json || cat "${{install_path}}/.build-hash") if [ "X$pkg_hash" = X ]; then continue fi