From 558f7f007ecd76408e060b148b4255cc025506f9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 6 Apr 2022 07:27:02 +0200 Subject: link_tree.py: format conflict error message (#29870) Show each `[src a] and [src b] both project to [dst]` on a separate line. --- lib/spack/llnl/util/link_tree.py | 4 ++-- 1 file 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) -- cgit v1.2.3-70-g09d2