From da4d4ef676cbe971b80d52a581cf7c8e0869d9ab Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Tue, 21 Jan 2025 11:16:25 +0100 Subject: just-lock: Fix deduplication of 'computed' roots Based on 76ce2123 --- bin/just-lock.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bin/just-lock.py') diff --git a/bin/just-lock.py b/bin/just-lock.py index 65838cf1..75ca7da8 100755 --- a/bin/just-lock.py +++ b/bin/just-lock.py @@ -1853,6 +1853,15 @@ def deduplicate(repos: Json, user_keep: List[str]) -> Json: if isinstance(root_val, str) and (root_val in renaming): new_roots[root] = final_root_reference(root_val) desc = dict(desc, **new_roots) + + # Update target repos of precomputed roots + if isinstance(desc.get("repository"), dict): + repo_root: Json = desc["repository"] + if repo_root["type"] == "computed" and \ + repo_root["repo"] in renaming: + repo_root = \ + dict(repo_root, **{"repo": renaming[repo_root["repo"]]}) + desc = dict(desc, **{"repository": repo_root}) new_repos[name] = desc return dict(repos, **{"repositories": new_repos}) -- cgit v1.2.3