Make the parser already add the .eb suffix if it is not there. This is neededso that the keys in the option dictionary can be expected to be the full EasyConfig names

Author: casparvl

easybuild/framework/easystack.py

@@ -89,10 +89,7 @@ def compose_ec_filenames(self):
 
         # entries specified via 'easyconfigs' top-level key
         for ec in self.easyconfigs:
-            if not ec.endswith('.eb'):
-                ec_filenames.append(ec + '.eb')
-            else:
-                ec_filenames.append(ec)
+            ec_filenames.append(ec)
         return ec_filenames
 
     # flags applicable to all sw (i.e. robot)
@@ -169,12 +166,16 @@ def parse_by_easyconfigs(filepath, easyconfigs, easybuild_version=None, robot=Fa
 
         for easyconfig in easyconfigs:
             if isinstance(easyconfig, str):
+                if not easyconfig.endswith('.eb'):
+                    easyconfig = easyconfig + '.eb'
                 easystack.easyconfigs.append(easyconfig)
             elif isinstance(easyconfig, dict):
                 if len(easyconfig) == 1:
                     # Get single key from dictionary 'easyconfig'
                     easyconf_name = list(easyconfig.keys())[0]
                     # Add easyconfig name to the list
+                    if not easyconf_name.endswith('.eb'):
+                        easyconf_name = easyconf_name + '.eb'
                     easystack.easyconfigs.append(easyconf_name)
                     # Add options to the ec_opts dict
                     if 'options' in easyconfig[easyconf_name].keys():