diff options
| -rw-r--r-- | buildstream/_yaml.py | 2 | ||||
| -rw-r--r-- | tests/format/project.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/buildstream/_yaml.py b/buildstream/_yaml.py index 66500fbad..4ee12a18c 100644 --- a/buildstream/_yaml.py +++ b/buildstream/_yaml.py @@ -467,7 +467,7 @@ def node_get_project_path(node, key, project_dir, *, "{}: Specified path '{}' does not exist" .format(provenance, path_str)) - is_inside = project_dir_path in full_resolved_path.parents or ( + 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: diff --git a/tests/format/project.py b/tests/format/project.py index 214592811..46145e578 100644 --- a/tests/format/project.py +++ b/tests/format/project.py @@ -188,3 +188,15 @@ def test_project_refs_options(cli, datafiles): # Assert that the cache keys are different assert result1.output != result2.output + + +@pytest.mark.datafiles(os.path.join(DATA_DIR, 'element-path')) +def test_element_path_project_path_contains_symlinks(cli, datafiles, tmpdir): + real_project = str(datafiles) + linked_project = os.path.join(str(tmpdir), 'linked') + os.symlink(real_project, linked_project) + os.makedirs(os.path.join(real_project, 'elements'), exist_ok=True) + with open(os.path.join(real_project, 'elements', 'element.bst'), 'w') as f: + f.write("kind: manual\n") + result = cli.run(project=linked_project, args=['show', 'element.bst']) + result.assert_success() |