zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP fixing all the things that broke when I changed the anonymous spec names

Browse Source
This commit is contained in:
Gregory Becker
2016-05-09 17:06:21 -07:00
parent a7026da45c
commit c6ac709d70
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/spec.py
View File

@@ -2122,6 +2122,7 @@ def spec(self, name, check_valid_token = False):
spec_namespace = None spec_namespace = None
self.check_identifier(spec_name) self.check_identifier(spec_name)
else: else:
spec_namespace = None
spec_name = None spec_name = None
@@ -2293,7 +2294,8 @@ def parse_anonymous_spec(spec_like, pkg_name):
try: try:
anon_spec = Spec(spec_like) anon_spec = Spec(spec_like)
if anon_spec.name != pkg_name: if anon_spec.name != pkg_name:
raise SpecParseError(spack.parse.ParseError("","","Expected anonymous spec for package %s but found spec for package %s" % (pkg_name, anon_spec_name) )) print anon_spec.name, pkg_name
raise SpecParseError(spack.parse.ParseError("","","Expected anonymous spec for package %s but found spec for package %s" % (pkg_name, anon_spec.name) ))
except SpecParseError: except SpecParseError:
anon_spec = Spec(pkg_name + ' ' + spec_like) anon_spec = Spec(pkg_name + ' ' + spec_like)
if anon_spec.name != pkg_name: raise ValueError( if anon_spec.name != pkg_name: raise ValueError(