Merge pull request #10325 from K900/ooformatting

build-remote: fix format string shenanigans
NixOS · Mar 26, 2024 · 0bf0191 · 0bf0191
2 parents 1394d4e + 2d4edb9
commit 0bf0191
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
@@ -202,7 +202,7 @@ static int main_build_remote(int argc, char * * argv)
                         else
                             drvstr = "<unknown>";
 
-                        auto error = HintFmt(errorText);
+                        auto error = HintFmt::fromFormatString(errorText);
                         error
                             % drvstr
                             % neededSystem

diff --git a/src/libutil/fmt.hh b/src/libutil/fmt.hh
@@ -144,6 +144,10 @@ public:
         : HintFmt("%s", Uncolored(literal))
     { }
 
+    static HintFmt fromFormatString(const std::string & format) {
+        return HintFmt(boost::format(format));
+    }
+
     /**
      * Interpolate the given arguments into the format string.
      */