Review changes

Author: edmondac

easybuild/framework/easyconfig/easyconfig.py

@@ -1226,30 +1226,30 @@ def get_parsed_multi_deps(self):
 
         return multi_deps
 
-    def find_dep_version_match(self, dep):
+    def find_dep_version_match(self, dep_version):
         """Identify the correct version for this system from the choices provided. This returns the version to use."""
-        if isinstance(dep['version'], string_type):
-            self.log.debug("Version is already a string ('%s'), OK", dep['version'])
-            return dep['version']
-        elif dep['version'] is None:
-            self.log.debug("Version is None, OK", dep)
+        if isinstance(dep_version, string_type):
+            self.log.debug("Version is already a string ('%s'), OK", dep_version)
+            return dep_version
+        elif dep_version is None:
+            self.log.debug("Version is None, OK")
             return None
-        elif isinstance(dep['version'], dict):
+        elif isinstance(dep_version, dict):
             # 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 x not in arch_keys]
+            arch_keys = [x for x in dep_version.keys() if x.startswith('arch=')]
+            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 using key %s: %s", dep['version'], my_arch_key, ver)
+                if my_arch_key in dep_version:
+                    ver = dep_version[my_arch_key]
+                    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)
+                    raise EasyBuildError("No matches for version in %s (looking for %s)", dep_version, my_arch_key)
 
-        raise EasyBuildError("Unknown value type for version: %s", dep['version'])
+        raise EasyBuildError("Unknown value type for version: %s", dep_version)
 
     # private method
     def _parse_dependency(self, dep, hidden=False, build_only=False):
@@ -1332,7 +1332,7 @@ def _parse_dependency(self, dep, hidden=False, build_only=False):
             raise EasyBuildError("Dependency %s of unsupported type: %s", dep, type(dep))
 
         # Find the version to use on this system
-        dependency['version'] = self.find_dep_version_match(dependency)
+        dependency['version'] = self.find_dep_version_match(dependency['version'])
 
         if dependency['external_module']:
             # check whether the external module is hidden