From afb55f36df5e65007cb30798242ceb402f0572a4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:12:29 +0100
Subject: [PATCH] Fix bad_format_string error when builder stdout contains %
 (#10063)

(cherry picked from commit e2b6821ca0147f36bcb9404aab080f80746984c8)

Co-authored-by: roblabla <unfiltered@roblab.la>
---
 src/libutil/serialise.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 3d5121a19..6539abed1 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -444,7 +444,7 @@ Error readError(Source & source)
     auto msg = readString(source);
     ErrorInfo info {
         .level = level,
-        .msg = hintformat(fmt("%s", msg)),
+        .msg = hintfmt(msg),
     };
     auto havePos = readNum<size_t>(source);
     assert(havePos == 0);
@@ -453,7 +453,7 @@ Error readError(Source & source)
         havePos = readNum<size_t>(source);
         assert(havePos == 0);
         info.traces.push_back(Trace {
-            .hint = hintformat(fmt("%s", readString(source)))
+            .hint = hintfmt(readString(source))
         });
     }
     return Error(std::move(info));