From 431d8438fe6a5a1a798accdecb815d864c088c6d Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Tue, 15 Jan 2019 18:21:29 -0700 Subject: [PATCH] manifest: remove META_NAMES Let's not deal with META_NAMES anymore, which is only used once. We can emit a nicer error message for the user without it. Signed-off-by: Marti Bolivar --- src/west/manifest.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/west/manifest.py b/src/west/manifest.py index f235f28..0ce9a15 100644 --- a/src/west/manifest.py +++ b/src/west/manifest.py @@ -34,10 +34,6 @@ WEST_URL_DEFAULT = 'https://github.com/zephyrproject-rtos/west' # Default revision to check out of the west repository. WEST_REV_DEFAULT = 'master' -META_NAMES = ['west'] -'''Names of the special "meta-projects", which are reserved and cannot -be used to name a project in the manifest file.''' - MANIFEST_SECTIONS = ['manifest', 'west'] '''Sections in the manifest file''' @@ -249,9 +245,8 @@ class Manifest: for mp in manifest['projects']: # Validate the project name. name = mp['name'] - if name in META_NAMES: - self._malformed('the name "{}" is reserved and cannot '. - format(name) + + if name == 'west': + self._malformed('the name "west" is reserved and cannot ' 'be used to name a manifest project') # Validate the project remote.