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

initRepoAtomically: Catch directory_not_empty

(cherry picked from commit 388271e8ec)
This commit is contained in:
Robert Hensing 2024-11-06 23:52:48 +01:00 committed by Mergify
parent 960c288fa0
commit c3e2419e73

View file

@ -171,8 +171,12 @@ static void initRepoAtomically(std::filesystem::path &path, bool bare) {
try { try {
std::filesystem::rename(tmpDir, path); std::filesystem::rename(tmpDir, path);
} catch (std::filesystem::filesystem_error & e) { } catch (std::filesystem::filesystem_error & e) {
if (e.code() == std::errc::file_exists) // Someone might race us to create the repository. // Someone may race us to create the repository.
if (e.code() == std::errc::file_exists
// `path` may be attempted to be deleted by s::f::rename, in which case the code is:
|| e.code() == std::errc::directory_not_empty) {
return; return;
}
else else
throw SysError("moving temporary git repository from %s to %s", tmpDir, path); throw SysError("moving temporary git repository from %s to %s", tmpDir, path);
} }