Merge pull request #12613 from Mic92/minor-cleanups

Fix double quoting in some error messages

Author: edolstra

src/libfetchers/git.cc

@@ -637,7 +637,7 @@ struct GitInputScheme : InputScheme
                     if (!input.getRev())
                         setWriteTime(localRefFile, now, now);
                 } 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))
                     warn("could not update cached head '%s' for '%s'", ref, repoInfo.locationToArg());

src/libflake/flake/flake.cc

@@ -863,11 +863,11 @@ LockedFlake lockFlake(
                             auto s = chomp(diff);
                             if (lockFileExists) {
                                 if (s.empty())
-                                    warn("updating lock file '%s'", outputLockFilePath);
+                                    warn("updating lock file %s", outputLockFilePath);
                                 else
-                                    warn("updating lock file '%s':\n%s", outputLockFilePath, s);
+                                    warn("updating lock file %s:\n%s", outputLockFilePath, s);
                             } 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;
 

src/libstore/remote-store.cc

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