[Notes] [Git][BuildStream/buildstream][bst-1.2] 3 commits: buildstream/_project.py: Report if project.conf is missing name

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch bst-1.2 at BuildStream / buildstream

Commits:

• 127893fa
  by Tom Pollard at 2018-08-31T06:26:44Z

  buildstream/_project.py: Report if project.conf is missing name
  
  Explicitly check that project.conf contains a name. This resolves
  the issue of the provenance check from _yaml.py incorrectly reporting
  the offending file as the default_config_node projectconfig.yaml
  when no name key exists in the pre_config_node dict.
  

• f861dc0b
  by Tristan Van Berkom at 2018-08-31T06:26:52Z

  _project.py: Adding FIXME comment to address #591 properly
  

• 2b94532a
  by Tristan Van Berkom at 2018-08-31T06:51:54Z

  Merge branch 'tristan/591-workaround-1.2' into 'bst-1.2'
  
  Backport workaround for #591
  
  See merge request BuildStream/buildstream!767

1 changed file:

• buildstream/_project.py

Changes:

buildstream/_project.py

---

...	...	@@ -395,6 +395,17 @@ class Project():
395	395	"Project requested format version {}, but BuildStream {}.{} only supports up until format version {}"
396	396	.format(format_version, major, minor, BST_FORMAT_VERSION))
397	397
	398	+ # FIXME:
	399	+ #
	400	+ # Performing this check manually in the absense
	401	+ # of proper support from _yaml.node_get(), this should
	402	+ # be removed in favor of a proper accessor function
	403	+ # from the _yaml module when #591 is fixed.
	404	+ #
	405	+ if self._project_conf.get('name') is None:
	406	+ raise LoadError(LoadErrorReason.INVALID_DATA,
	407	+ "{}: project.conf does not contain expected key '{}'".format(projectfile, 'name'))
	408	+
398	409	# The project name, element path and option declarations
399	410	# are constant and cannot be overridden by option conditional statements
400	411	self.name = _yaml.node_get(pre_config_node, str, 'name')

—
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.