Merge pull request #6285 from theotherjimmy/fix-6284

Improve json schema and schema errors
ARMmbed · Mar 7, 2018 · 79bd263 · 79bd263
2 parents 4b322d6 + 67e76f3
commit 79bd263
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/config/__init__.py b/tools/config/__init__.py
@@ -392,7 +392,7 @@ def format_validation_error(self, error, path):
             return self.format_validation_error(error.context[0], path)
         else:
             return "in {} element {}: {}".format(
-                path, str(".".join(error.absolute_path)), error.message)
+                path, str(".".join(str(p) for p in error.absolute_path)), error.message)
 
     def __init__(self, tgt, top_level_dirs=None, app_config=None):
         """Construct a mbed configuration

diff --git a/tools/config/definitions.json b/tools/config/definitions.json
@@ -11,7 +11,7 @@
     "type": "array",
     "items": {
       "type": "string",
-      "pattern": "(^[\\w]+$|^[\\w]+=.+$)"
+      "pattern": "(^[\\w()_]+$|^[\\w()_]+=.+$)"
     }
   },
   "config_definition": {