[Notes] [Git][BuildStream/buildstream][tpollard/591] buildstream/_project.py: Report if project.conf is missing name

[Tom Pollard <gitlab mg gitlab com>]

Title: GitLab

Tom Pollard pushed to branch tpollard/591 at BuildStream / buildstream

Commits:

• c88d8f98
  by Tom Pollard at 2018-08-20T09:12:30Z

  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.
  

1 changed file:

• buildstream/_project.py

Changes:

buildstream/_project.py

---

...	...	@@ -398,6 +398,11 @@ class Project():
398	398	"Project requested format version {}, but BuildStream {}.{} only supports up until format version {}"
399	399	.format(format_version, major, minor, BST_FORMAT_VERSION))
400	400
	401	+ # Check if project.conf contains name key field
	402	+ if self._project_conf.get('name') is None:
	403	+ raise LoadError(LoadErrorReason.INVALID_DATA,
	404	+ "{}: project.conf does not contain expected key '{}'".format(projectfile, 'name'))
	405	+
401	406	# The project name, element path and option declarations
402	407	# are constant and cannot be overridden by option conditional statements
403	408	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.