diff options
Diffstat (limited to 'lib/spack/spack/spec.py')
| -rw-r--r-- | lib/spack/spack/spec.py | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 88184de30f..600ce988d7 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -910,19 +910,23 @@ class FlagMap(lang.HashableMap): yield flags def __str__(self): - sorted_keys = [k for k in sorted(self.keys()) if self[k] != []] - cond_symbol = " " if len(sorted_keys) > 0 else "" - return ( - cond_symbol - + " ".join( - key - + ('=="' if True in [f.propagate for f in self[key]] else '="') - + " ".join(self[key]) - + '"' - for key in sorted_keys - ) - + cond_symbol - ) + sorted_items = sorted((k, v) for k, v in self.items() if v) + + result = "" + for flag_type, flags in sorted_items: + normal = [f for f in flags if not f.propagate] + if normal: + result += f" {flag_type}={spack.parser.quote_if_needed(' '.join(normal))}" + + propagated = [f for f in flags if f.propagate] + if propagated: + result += f" {flag_type}=={spack.parser.quote_if_needed(' '.join(propagated))}" + + # TODO: somehow add this space only if something follows in Spec.format() + if sorted_items: + result += " " + + return result def _sort_by_dep_types(dspec: DependencySpec): |