summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-11-28 17:48:29 +0100
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-11-29 10:33:38 +0100
commit045fffaa91d98a771f9e3bf6ac8248565bd0d41f (patch)
tree07a93c6e41950a5382cc3c366031fddaf8003974
parentade61e8c44b19591dae8d4513d6c9924fb5e0050 (diff)
downloadjustbuild-045fffaa91d98a771f9e3bf6ac8248565bd0d41f.tar.gz
just-import-git: Fix foreign config location
As per documentation, if a location is given for the configuration file in the foreign repository then it must be taken relative to its root. However, in our implementation this location is taken relative to the current directory. Fix this.
-rwxr-xr-xbin/just-import-git.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/just-import-git.py b/bin/just-import-git.py
index eb3b690f..d2c25eef 100755
--- a/bin/just-import-git.py
+++ b/bin/just-import-git.py
@@ -274,7 +274,8 @@ def handle_import(args: Namespace) -> Json:
inherit_env=args.inherit_env,
)
if args.foreign_repository_config:
- foreign_config_file = args.foreign_repository_config
+ foreign_config_file = os.path.join(srcdir,
+ args.foreign_repository_config)
else:
foreign_config_file = get_repository_config_file(srcdir)
foreign_config: Json = {}