diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-01-12 09:15:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-01-12 10:56:37 +0100 |
| commit | 5ff038473e3f3d6a84e69c712446ba3e200aa9b2 (patch) | |
| tree | 931d4565e19c3c5075778581e951fe7ead83bb18 /nix/libstore | |
| parent | 94579edc3fa4bd67ffe98c4170f391a2dd9b140a (diff) | |
daemon: Fix several format strings.
This is a followup to 3af52f845fe2ceb448416ac7b9f48925673c594e and
6f1448ef89c8ad29e2a479099531fd3a87701e46.
* nix/libstore/local-store.cc (LocalStore::queryValidPathId): Change %1% to {}.
* nix/libstore/optimise-store.cc (LocalStore::optimisePath_): Likewise.
* nix/nix-daemon/guix-daemon.cc (open_unix_domain_socket): Likewise.
(main): Likewise.
* nix/libutil/affinity.cc (restoreAffinity): Remove useless %1%.
Change-Id: I3a7cd79cd69ab58f14118662f1dcf2fef067a6b7
Diffstat (limited to 'nix/libstore')
| -rw-r--r-- | nix/libstore/local-store.cc | 2 | ||||
| -rw-r--r-- | nix/libstore/optimise-store.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 43f3c1770a8..b8308b1aae5 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -654,7 +654,7 @@ uint64_t LocalStore::queryValidPathId(const Path & path) { auto use(stmtQueryPathInfo.use()(path)); if (!use.next()) - throw Error(std::format("path `%1%' is not valid", path)); + throw Error(std::format("path `{}' is not valid", path)); return use.getInt(0); } diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index 54aa166c344..93ce1f55365 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -182,12 +182,12 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa } if (st.st_size != stLink.st_size) { - printMsg(lvlError, std::format("removing corrupted link `%1%'", linkPath)); + printMsg(lvlError, std::format("removing corrupted link `{}'", linkPath)); unlink(linkPath.c_str()); goto retry; } - printMsg(lvlTalkative, std::format("linking `%1%' to `%2%'", path, linkPath)); + printMsg(lvlTalkative, std::format("linking `{}' to `{}'", path, linkPath)); /* Make the containing directory writable, but only if it's not the store itself (we don't want or need to mess with its |