Merge pull request #10328 from NixOS/backport-10325-to-2.21-maintenance

[Backport 2.21-maintenance] build-remote: fix format string shenanigans
This commit is contained in:
Théophane Hufschmitt 2024-03-26 15:04:01 +01:00 committed by GitHub
commit 3272ed0d58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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.
*/