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

This commit is contained in:
Shea Levy
2018-03-02 10:59:59 -05:00
5 changed files with 16 additions and 1 deletions
+2 -1
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
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
View File
@@ -29,6 +29,7 @@ struct CmdDumpPath : StorePathCommand
{
FdSink sink(STDOUT_FILENO);
store->narFromPath(storePath, sink);
sink.flush();
}
};