summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGregory Becker <becker33@llnl.gov>2016-05-06 18:03:43 -0700
committerGregory Becker <becker33@llnl.gov>2016-05-06 18:03:43 -0700
commit1523ebe9f7ba8f35170c7dfd2fae7b7d4f381686 (patch)
treed17aaa760c64e6d4ba67933af9202349c9702063 /lib
parent06b9433351541e9f84d85d3014d7016abbf5edc9 (diff)
downloadspack-1523ebe9f7ba8f35170c7dfd2fae7b7d4f381686.tar.gz
spack-1523ebe9f7ba8f35170c7dfd2fae7b7d4f381686.tar.bz2
spack-1523ebe9f7ba8f35170c7dfd2fae7b7d4f381686.tar.xz
spack-1523ebe9f7ba8f35170c7dfd2fae7b7d4f381686.zip
Working properly to display but not reuse old specs from yaml
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/spec.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 93befbec33..2b33ff3d36 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -755,8 +755,7 @@ class Spec(object):
"""
Return a hash of the entire spec DAG, including connectivity.
"""
- print self, "++"
- if getattr(self, 'hash', None):
+ if self.hash:
return self.hash
else:
yaml_text = yaml.dump(
@@ -769,8 +768,7 @@ class Spec(object):
def to_node_dict(self):
params = dict( (name, v.value) for name, v in self.variants.items() )
- params.update( dict( (name, []) for name in FlagMap.valid_compiler_flags() ) )
- params.update( dict( (name, value) for name, value in self.compiler_flags.items()) ) #override
+ params.update( dict( (name, value) for name, value in self.compiler_flags.items()) )
d = {
'parameters' : params,
'arch' : self.architecture,
@@ -1646,6 +1644,7 @@ class Spec(object):
self.variants.spec = self
self.external = other.external
self.namespace = other.namespace
+ self.hash = other.hash
# If we copy dependencies, preserve DAG structure in the new spec
if kwargs.get('deps', True):
@@ -1771,7 +1770,8 @@ class Spec(object):
self.variants,
self.architecture,
self.compiler,
- self.compiler_flags)
+ self.compiler_flags,
+ self.dag_hash())
def eq_node(self, other):
@@ -2126,8 +2126,6 @@ class SpecParser(spack.parse.Parser):
if spec_name != '':
self.check_identifier(spec_name)
- print spec_name, "++"
-
# This will init the spec without calling __init__.
spec = Spec.__new__(Spec)
spec.name = spec_name