wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Merge pull request #12613 from Mic92/minor-cleanups

Browse source 
Fix double quoting in some error messages
This commit is contained in:
Eelco Dolstra 2025-03-07 18:38:48 +01:00 • committed by GitHub
commit 47e23811ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libfetchers/git.cc
View file

@ -637,7 +637,7 @@ struct GitInputScheme : InputScheme
if (!input.getRev()) if (!input.getRev())
setWriteTime(localRefFile, now, now); setWriteTime(localRefFile, now, now);
} catch (Error & e) { } catch (Error & e) {
warn("could not update mtime for file '%s': %s", localRefFile, e.info().msg); warn("could not update mtime for file %s: %s", localRefFile, e.info().msg);
} }
if (!originalRef && !storeCachedHead(repoUrl.to_string(), ref)) if (!originalRef && !storeCachedHead(repoUrl.to_string(), ref))
warn("could not update cached head '%s' for '%s'", ref, repoInfo.locationToArg()); warn("could not update cached head '%s' for '%s'", ref, repoInfo.locationToArg());

6
src/libflake/flake/flake.cc
View file

@ -863,11 +863,11 @@ LockedFlake lockFlake(
auto s = chomp(diff); auto s = chomp(diff);
if (lockFileExists) { if (lockFileExists) {
if (s.empty()) if (s.empty())
warn("updating lock file '%s'", outputLockFilePath); warn("updating lock file %s", outputLockFilePath);
else else
warn("updating lock file '%s':\n%s", outputLockFilePath, s); warn("updating lock file %s:\n%s", outputLockFilePath, s);
} else } else
warn("creating lock file '%s': \n%s", outputLockFilePath, s); warn("creating lock file %s: \n%s", outputLockFilePath, s);
std::optional<std::string> commitMessage = std::nullopt; std::optional<std::string> commitMessage = std::nullopt;

2
src/libstore/remote-store.cc
View file

@ -28,7 +28,7 @@ RemoteStore::RemoteStore(const Params & params)
: RemoteStoreConfig(params) : RemoteStoreConfig(params)
, Store(params) , Store(params)
, connections(make_ref<Pool<Connection>>( , connections(make_ref<Pool<Connection>>(
std::max(1, (int) maxConnections), std::max(1, maxConnections.get()),
[this]() { [this]() {
auto conn = openConnectionWrapper(); auto conn = openConnectionWrapper();
try { try {