diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-04-06 07:27:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 07:27:02 +0200 |
| commit | 558f7f007ecd76408e060b148b4255cc025506f9 (patch) | |
| tree | 1a863fffeaeee8ebe39186e3935ff07c090f32c9 /lib | |
| parent | a717ba9b870049f828373497a251d3daffc64230 (diff) | |
| download | spack-558f7f007ecd76408e060b148b4255cc025506f9.tar.gz spack-558f7f007ecd76408e060b148b4255cc025506f9.tar.bz2 spack-558f7f007ecd76408e060b148b4255cc025506f9.tar.xz spack-558f7f007ecd76408e060b148b4255cc025506f9.zip | |
link_tree.py: format conflict error message (#29870)
Show each `[src a] and [src b] both project to [dst]` on a separate
line.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/llnl/util/link_tree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index 58cc30c2b1..34cce1247c 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -426,9 +426,9 @@ class MergeConflictSummary(MergeConflictError): A human-readable summary of file system view merge conflicts (showing only the first 3 issues.) """ - msg = "{0} fatal error(s) when merging prefixes:\n".format(len(conflicts)) + msg = "{0} fatal error(s) when merging prefixes:".format(len(conflicts)) # show the first 3 merge conflicts. for conflict in conflicts[:3]: - msg += " `{0}` and `{1}` both project to `{2}`".format( + msg += "\n `{0}` and `{1}` both project to `{2}`".format( conflict.src_a, conflict.src_b, conflict.dst) super(MergeConflictSummary, self).__init__(msg) |