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

Fix windows build

Browse source 
PR #12767 accidentally broke it.

(cherry picked from commit 99041b4d84)
This commit is contained in:
John Ericson 2025-03-28 13:15:21 -04:00 • committed by Mergify
parent 004187e8cd
commit 003584e59e
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ LocalStore::LocalStore(
state->stmts = std::make_unique<State::Stmts>(); state->stmts = std::make_unique<State::Stmts>();
/* Create missing state directories if they don't already exist. */ /* Create missing state directories if they don't already exist. */
createDirs(realStoreDir); createDirs(realStoreDir.get());
if (readOnly) { if (readOnly) {
experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore); experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore);
} else { } else {

4
src/libutil/file-system.cc
View file

@ -475,12 +475,12 @@ void createDir(const Path & path, mode_t mode)
throw SysError("creating directory '%1%'", path); throw SysError("creating directory '%1%'", path);
} }
void createDirs(const Path & path) void createDirs(const fs::path & path)
{ {
try { try {
fs::create_directories(path); fs::create_directories(path);
} catch (fs::filesystem_error & e) { } catch (fs::filesystem_error & e) {
throw SysError("creating directory '%1%'", path); throw SysError("creating directory '%1%'", path.string());
} }
} }

9
src/libutil/file-system.hh
View file

@ -231,14 +231,9 @@ void deletePath(const std::filesystem::path & path, uint64_t & bytesFreed);
/** /**
* Create a directory and all its parents, if necessary. * Create a directory and all its parents, if necessary.
* *
* In the process of being deprecated for * Wrapper around `std::filesystem::create_directories` to handle exceptions.
* `std::filesystem::create_directories`.
*/ */
void createDirs(const Path & path); void createDirs(const std::filesystem::path & path);
inline void createDirs(PathView path)
{
return createDirs(Path(path));
}
/** /**
* Create a single directory. * Create a single directory.