From db3bf471ea152890a0ce6f75f231f42b2faaf6cb Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Sun, 12 Jun 2022 11:40:07 -0300
Subject: [PATCH] Add support for `globals` instead of `global`

---
 kibot/config_reader.py                    | 14 +++++++++-----
 tests/yaml_samples/step_gl_env.kibot.yaml |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kibot/config_reader.py b/kibot/config_reader.py
index f7cafbbe..908a1b07 100644
--- a/kibot/config_reader.py
+++ b/kibot/config_reader.py
@@ -335,16 +335,16 @@ class CfgYamlReader(object):
                             config_error("`import.file` must be a string ({})".format(str(v)))
                         fn = v
                     elif k == 'outputs':
-                        outs = self._parse_import_items('outputs', fn, v)
+                        outs = self._parse_import_items(k, fn, v)
                         explicit_outs = True
                     elif k == 'filters':
-                        filters = self._parse_import_items('filters', fn, v)
+                        filters = self._parse_import_items(k, fn, v)
                         explicit_fils = True
                     elif k == 'variants':
-                        vars = self._parse_import_items('variants', fn, v)
+                        vars = self._parse_import_items(k, fn, v)
                         explicit_vars = True
-                    elif k == 'global':
-                        globals = self._parse_import_items('global', fn, v)
+                    elif k in ['global', 'globals']:
+                        globals = self._parse_import_items(k, fn, v)
                         explicit_globals = True
                     else:
                         self._config_error_import(fn, "unknown import entry `{}`".format(str(v)))
@@ -372,6 +372,10 @@ class CfgYamlReader(object):
             data = yaml.safe_load(fstream)
         except yaml.YAMLError as e:
             config_error("Error loading YAML "+str(e))
+        # Accept `globals` for `global`
+        if 'globals' in data and 'global' not in data:
+            data['global'] = data['globals']
+            del data['globals']
         return data
 
     def read(self, fstream):
diff --git a/tests/yaml_samples/step_gl_env.kibot.yaml b/tests/yaml_samples/step_gl_env.kibot.yaml
index 29bebef5..26ff1fc1 100644
--- a/tests/yaml_samples/step_gl_env.kibot.yaml
+++ b/tests/yaml_samples/step_gl_env.kibot.yaml
@@ -1,7 +1,7 @@
 kiplot:
   version: 1
 
-global:
+globals:
   environment:
     symbols: '/test1'
     footprints: '/test2'