aboutsummaryrefslogtreecommitdiff
path: root/src/libutil
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2018-02-13 11:05:25 +0000
committerLinus Heckemann <git@sphalerite.org>2018-02-13 14:26:19 +0000
commit78ac3eb4ebc04e180abeb01bcc6f9d4103522eab (patch)
tree240d03638868440126931fecd8e6886b6e7a3bf5 /src/libutil
parentc5cc57e96220cd3ed915875f3b1eeb2ba1f98a30 (diff)
Fix #1762
nix-store --export, nix-store --dump, and nix dump-path would previously fail silently if writing the data out failed, because a) FdSink::write ignored exceptions, and b) the commands relied on FdSink's destructor, which ignores exceptions, to flush the data out. This could cause rather opaque issues with installing nixos, because nix-store --export would happily proceed even if it couldn't write its data out (e.g. if nix-store --import on the other side of the pipe failed). This commit adds tests that expose these issues in the nix-store commands, and fixes them for all three.
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/serialise.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 950e6362a..9e2a502af 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -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;
}
}