nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-21 22:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test that nix-store --restore fails if the output already exists

Browse Source 
This restores the behaviour from before the std::filesystem
refactorings.
This commit is contained in:
Eelco Dolstra 2024-09-05 16:48:43 +02:00
parent 83d5b32803
commit da1ad28912
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libutil/fs-sink.cc
View File

@ -71,7 +71,8 @@ static GlobalConfig::Register r1(&restoreSinkSettings);
void RestoreSink::createDirectory(const CanonPath & path) void RestoreSink::createDirectory(const CanonPath & path)
{ {
std::filesystem::create_directory(dstPath / path.rel()); if (!std::filesystem::create_directory(dstPath / path.rel()))
throw Error("path '%s' already exists", (dstPath / path.rel()).string());
}; };
struct RestoreRegularFile : CreateRegularFileSink { struct RestoreRegularFile : CreateRegularFileSink {

3
tests/functional/nars.sh
View File

@ -10,6 +10,9 @@ clearStore
rm -rf "$TEST_ROOT/out" rm -rf "$TEST_ROOT/out"
expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted" expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted"
# Check that nix-store --restore fails if the output already exists.
expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
# Check whether restoring and dumping a NAR that contains case # Check whether restoring and dumping a NAR that contains case
# collisions is round-tripping, even on a case-insensitive system. # collisions is round-tripping, even on a case-insensitive system.
rm -rf "$TEST_ROOT/case" rm -rf "$TEST_ROOT/case"