Review comments - check for key without equals sign

Author: edmondac

easybuild/framework/easyconfig/easyconfig.py

@@ -1238,13 +1238,13 @@ def find_dep_version_match(self, dep):
             # figure out matches based on dict keys (after splitting on '=')
             my_arch_key = 'arch=%s' % get_cpu_architecture()
             arch_keys = [x for x in dep['version'].keys() if x.startswith('arch=')]
-            other_keys = [x for x in dep['version'].keys() if '=' in x and x not in arch_keys]
+            other_keys = [x for x in dep['version'].keys() if x not in arch_keys]
             if other_keys:
                 raise EasyBuildError("Unexpected keys in version: %s. Only 'arch=' keys are supported", other_keys)
             if arch_keys:
                 if my_arch_key in dep['version']:
                     ver = dep['version'][my_arch_key]
-                    self.log.info("Version selected from %s: %s", dep['version'], ver)
+                    self.log.info("Version selected from %s using key %s: %s", dep['version'], my_arch_key, ver)
                     return ver
                 else:
                     raise EasyBuildError("No matches for version in %s (looking for %s)", dep['version'], my_arch_key)

test/framework/easyconfig.py

@@ -3163,21 +3163,22 @@ def test_unexpected_version_keys_caught(self):
 
         my_arch = st.get_cpu_architecture()
         expected_version = '1.2.3'
-        dep_str = "[('foo', {'bar=%s': '%s', 'arch=Foo': 'bar'})]" % (my_arch, expected_version)
 
-        test_ec = os.path.join(self.test_prefix, 'test.eb')
-        test_ectxt = '\n'.join([
-            "easyblock = 'ConfigureMake'",
-            "name = 'test'",
-            "version = '0.2'",
-            "homepage = 'https://example.com'",
-            "description = 'test'",
-            "toolchain = SYSTEM",
-            "dependencies = %s" % dep_str,
-        ])
-        write_file(test_ec, test_ectxt)
+        for dep_str in ("[('foo', {'bar=%s': '%s', 'arch=Foo': 'bar'})]" % (my_arch, expected_version),
+                        "[('foo', {'blah': 'bar'})]"):
+            test_ec = os.path.join(self.test_prefix, 'test.eb')
+            test_ectxt = '\n'.join([
+                "easyblock = 'ConfigureMake'",
+                "name = 'test'",
+                "version = '0.2'",
+                "homepage = 'https://example.com'",
+                "description = 'test'",
+                "toolchain = SYSTEM",
+                "dependencies = %s" % dep_str,
+            ])
+            write_file(test_ec, test_ectxt)
 
-        self.assertRaises(EasyBuildError, EasyConfig, test_ec)
+            self.assertRaises(EasyBuildError, EasyConfig, test_ec)
 
 
 def suite():