diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-16 11:19:51 +0200 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-19 15:50:15 +0200 |
commit | 7e6330e7c2ecdee4cc7edf137b9e4616c55a57b1 (patch) | |
tree | d0c019513a10abbb792323f3d1724f23476e1a8f /bin/just-mr.py | |
parent | ff8ecea73904cf6348fee13e83814809f55e26f5 (diff) | |
download | justbuild-7e6330e7c2ecdee4cc7edf137b9e4616c55a57b1.tar.gz |
Storage config: change layout to support several storage generations
Diffstat (limited to 'bin/just-mr.py')
-rwxr-xr-x | bin/just-mr.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/just-mr.py b/bin/just-mr.py index 3eade552..39d9d7c2 100755 --- a/bin/just-mr.py +++ b/bin/just-mr.py @@ -199,7 +199,7 @@ def git_root(*, upstream: Optional[str]) -> str: elif upstream and os.path.isabs(upstream) and os.path.isdir(upstream): return upstream else: - return os.path.join(g_ROOT, "git") + return os.path.join(g_ROOT, "repositories/generation-0/git") def is_cache_git_root(upstream: Optional[str]) -> bool: @@ -393,7 +393,8 @@ def archive_tmp_checkout_dir(content: str, repo_type: str) -> str: def archive_tree_id_file(content: str, repo_type: str) -> str: - return os.path.join(g_ROOT, "tree-map", repo_type, content) + return os.path.join(g_ROOT, "repositories/generation-0/tree-map", + repo_type, content) def get_distfile(desc: Json) -> str: @@ -577,7 +578,8 @@ def distdir_tmp_dir(content: str) -> str: def distdir_tree_id_file(content: str) -> str: - return os.path.join(g_ROOT, "distfiles-tree-map", content) + return os.path.join(g_ROOT, "repositories/generation-0/distfiles-tree-map", + content) def distdir_checkout(desc: Json, repos: Json): |