summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Becker <becker33@llnl.gov>2015-11-11 10:09:03 -0800
committerGregory Becker <becker33@llnl.gov>2015-11-11 10:09:03 -0800
commitcd69681ae567efeee0703b4f106094142a0f697f (patch)
tree66a93a53b0e55be249e290b8f96af2a2fcc60dab
parent5417a514e9c71e8f3b75c5b4239c727aff6fde1d (diff)
downloadspack-cd69681ae567efeee0703b4f106094142a0f697f.tar.gz
spack-cd69681ae567efeee0703b4f106094142a0f697f.tar.bz2
spack-cd69681ae567efeee0703b4f106094142a0f697f.tar.xz
spack-cd69681ae567efeee0703b4f106094142a0f697f.zip
merged in work from other computer and starting to track down bugs
-rw-r--r--lib/spack/spack/spec.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index f95d7950a0..72117e1cb3 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -1834,6 +1834,7 @@ class SpecParser(spack.parse.Parser):
except spack.parse.ParseError, e:
raise SpecParseError(e)
+
return specs
@@ -1900,15 +1901,16 @@ class SpecParser(spack.parse.Parser):
elif self.accept(ON):
self.expect(ID)
self.check_identifier()
- input = self.token.value
+ option = self.token.value
if self.accept(EQ):
if self.accept(QT):
self.token.value = self.token.value[1:-1]
else:
self.expect(ID)
- spec._add_flag(input,self.token.value)
+ print "about to add", option, "=", self.token.value
+ spec._add_flag(option,self.token.value)
else:
- spec._add_variant(self.variant(input),True)
+ spec._add_variant(self.variant(option),True)
check_valid_token = False
elif self.accept(OFF):