1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 19:03:16 +02:00

Merge pull request #7942 from edolstra/remove-format

Remove FormatOrString and remaining uses of format()
This commit is contained in:
Eelco Dolstra 2023-03-03 10:22:11 +01:00 committed by GitHub
commit f0908f592c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 102 additions and 125 deletions

View file

@ -460,7 +460,7 @@ static void opPrintEnv(Strings opFlags, Strings opArgs)
/* Print each environment variable in the derivation in a format
* that can be sourced by the shell. */
for (auto & i : drv.env)
cout << format("export %1%; %1%=%2%\n") % i.first % shellEscape(i.second);
logger->cout("export %1%; %1%=%2%\n", i.first, shellEscape(i.second));
/* Also output the arguments. This doesn't preserve whitespace in
arguments. */