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

spec: remove {%compiler} in default format

Browse Source
This commit is contained in:
Massimiliano Culpo 2025-02-22 14:24:11 +01:00
parent 964baf9402
commit 5dbbb52579
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2116,14 +2116,12 @@ def long_spec(self):
def short_spec(self): def short_spec(self):
"""Returns a version of the spec with the dependencies hashed """Returns a version of the spec with the dependencies hashed
instead of completely enumerated.""" instead of completely enumerated."""
return self.format("{name}{@version} {variants}{ arch=architecture}{/hash:7}") return self.format("{name}{@version}{variants}{ arch=architecture}{/hash:7}")
@property @property
def cshort_spec(self): def cshort_spec(self):
"""Returns an auto-colorized version of ``self.short_spec``.""" """Returns an auto-colorized version of ``self.short_spec``."""
spec_format = "{name}{@version}{%compiler.name}{@compiler.version}" return self.cformat("{name}{@version}{variants}{ arch=architecture}{/hash:7}")
spec_format += "{variants}{ arch=architecture}{/hash:7}"
return self.cformat(spec_format)
@property @property
def prefix(self) -> spack.util.prefix.Prefix: def prefix(self) -> spack.util.prefix.Prefix:
@ -5330,8 +5328,7 @@ def __init__(self, spec):
class AmbiguousHashError(spack.error.SpecError): class AmbiguousHashError(spack.error.SpecError):
def __init__(self, msg, *specs): def __init__(self, msg, *specs):
spec_fmt = "{namespace}.{name}{@version}{%compiler}{compiler_flags}" spec_fmt = "{namespace}.{name}{@version}{variants}{ arch=architecture}{/hash:7}"
spec_fmt += "{variants}{ arch=architecture}{/hash:7}"
specs_str = "\n " + "\n ".join(spec.format(spec_fmt) for spec in specs) specs_str = "\n " + "\n ".join(spec.format(spec_fmt) for spec in specs)
super().__init__(msg + specs_str) super().__init__(msg + specs_str)