[Notes] [Git][BuildStream/buildstream][bst-1.2] 2 commits: Fix outside-of-project check when project path is not canonical.

[Tiago Gomes <gitlab mg gitlab com>]

Title: GitLab

Tiago Gomes pushed to branch bst-1.2 at BuildStream / buildstream

Commits:

• 075ffefa
  by Valentin David at 2018-09-28T09:23:19Z

  Fix outside-of-project check when project path is not canonical.
  
  The issue happens on Silverblue where /home is a symlink to /var/home.
  With this element-path is something like
  /var/home/user/project/elements, when the project path is
  /home/usr/project. Comparing canonical paths solves the issue.
  
  Fixes #673
  

• 621bd236
  by Tiago Gomes at 2018-09-28T09:52:15Z

  Merge branch 'valentindavid/silverblue-path-1.2' into 'bst-1.2'
  
  Backport to 1.2: Fix outside-of-project check when project path is not canonical.
  
  See merge request BuildStream/buildstream!834

2 changed files:

• buildstream/_yaml.py
• tests/format/project.py

Changes:

buildstream/_yaml.py

---

...	...	@@ -467,7 +467,7 @@ def node_get_project_path(node, key, project_dir, *,
467	467	"{}: Specified path '{}' does not exist"
468	468	.format(provenance, path_str))
469	469
470		- is_inside = project_dir_path in full_resolved_path.parents or (
	470	+ is_inside = project_dir_path.resolve() in full_resolved_path.parents or (
471	471	full_resolved_path == project_dir_path)
472	472
473	473	if path.is_absolute() or not is_inside:

tests/format/project.py

---

...	...	@@ -181,3 +181,15 @@ def test_project_refs_options(cli, datafiles):
181	181
182	182	# Assert that the cache keys are different
183	183	assert result1.output != result2.output
	184	+
	185	+
	186	+@pytest.mark.datafiles(os.path.join(DATA_DIR, 'element-path'))
	187	+def test_element_path_project_path_contains_symlinks(cli, datafiles, tmpdir):
	188	+ real_project = str(datafiles)
	189	+ linked_project = os.path.join(str(tmpdir), 'linked')
	190	+ os.symlink(real_project, linked_project)
	191	+ os.makedirs(os.path.join(real_project, 'elements'), exist_ok=True)
	192	+ with open(os.path.join(real_project, 'elements', 'element.bst'), 'w') as f:
	193	+ f.write("kind: manual\n")
	194	+ result = cli.run(project=linked_project, args=['show', 'element.bst'])
	195	+ result.assert_success()

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.