Skip to content
Snippets Groups Projects
Commit fb8860db authored by Jürg Billeter's avatar Jürg Billeter
Browse files

Merge branch 'jennis/less_restrictive_pathways' into 'master'

Fix warning when using an absolute path which exists inside the project

See merge request !956
parents c6306b88 9fa8a881
No related branches found
No related tags found
Loading
Pipeline #37295931 passed
......@@ -476,12 +476,18 @@ def node_get_project_path(node, key, project_dir, *,
is_inside = project_dir_path.resolve() in full_resolved_path.parents or (
full_resolved_path == project_dir_path)
if path.is_absolute() or not is_inside:
if not is_inside:
raise LoadError(LoadErrorReason.PROJ_PATH_INVALID,
"{}: Specified path '{}' must not lead outside of the "
"project directory"
.format(provenance, path_str))
if path.is_absolute():
raise LoadError(LoadErrorReason.PROJ_PATH_INVALID,
"{}: Absolute path: '{}' invalid.\n"
"Please specify a path relative to the project's root."
.format(provenance, path))
if full_resolved_path.is_socket() or (
full_resolved_path.is_fifo() or
full_resolved_path.is_block_device()):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment