wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 21:51:50 +02:00
Code Activity

Merge branch 'write-failure-fixes' of git://github.com/lheckemann/nix

Browse source
This commit is contained in:
Shea Levy 2018-03-02 10:59:59 -05:00
commit aa8bbbf69d
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
5 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/serialise.cc
View file

@ -67,7 +67,8 @@ void FdSink::write(const unsigned char * data, size_t len)
try {
writeFull(fd, data, len);
} catch (SysError & e) {
_good = true;
_good = false;
throw;
}
}

2
src/nix-store/nix-store.cc
View file

@ -631,6 +631,7 @@ static void opDump(Strings opFlags, Strings opArgs)
FdSink sink(STDOUT_FILENO);
string path = *opArgs.begin();
dumpPath(path, sink);
sink.flush();
}
@ -656,6 +657,7 @@ static void opExport(Strings opFlags, Strings opArgs)
FdSink sink(STDOUT_FILENO);
store->exportPaths(opArgs, sink);
sink.flush();
}

1
src/nix/dump-path.cc
View file

@ -29,6 +29,7 @@ struct CmdDumpPath : StorePathCommand
{
FdSink sink(STDOUT_FILENO);
store->narFromPath(storePath, sink);
sink.flush();
}
};