fix dep graph, use all_dependencies EasyConfig class variable rather …

…than the 'dependencies' parameter
boegel · Aug 15, 2015 · d2a86ff · d2a86ff
1 parent 5643657
commit d2a86ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/easybuild/framework/easyconfig/easyconfig.py b/easybuild/framework/easyconfig/easyconfig.py
@@ -402,7 +402,7 @@ def filter_hidden_deps(self):
         Filter hidden dependencies from list of dependencies.
         """
         # keep a copy of the original list of dependencies, since it may be modified below
-        self.all_dependencies = self['dependencies'][:]
+        self.all_dependencies = copy.deepcopy(self['dependencies'])
 
         dep_mod_names = [dep['full_mod_name'] for dep in self['dependencies']]
 

diff --git a/easybuild/framework/easyconfig/tools.py b/easybuild/framework/easyconfig/tools.py
@@ -169,14 +169,14 @@ def mk_node_name(spec):
     for spec in specs:
         spec['module'] = mk_node_name(spec['ec'])
         all_nodes.add(spec['module'])
-        spec['dependencies'] = [mk_node_name(s) for s in spec['dependencies']]
-        all_nodes.update(spec['dependencies'])
+        spec['ec'].all_dependencies = [mk_node_name(s) for s in spec['ec'].all_dependencies]
+        all_nodes.update(spec['ec'].all_dependencies)
 
     # build directed graph
     dgr = digraph()
     dgr.add_nodes(all_nodes)
     for spec in specs:
-        for dep in spec['dependencies']:
+        for dep in spec['ec'].all_dependencies:
             dgr.add_edge((spec['module'], dep))
 
     # write to file