diff options
author | Linus Heckemann <git@sphalerite.org> | 2018-02-13T11·05+0000 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2018-02-13T14·26+0000 |
commit | 78ac3eb4ebc04e180abeb01bcc6f9d4103522eab (patch) | |
tree | 240d03638868440126931fecd8e6886b6e7a3bf5 /src/nix-store/nix-store.cc | |
parent | c5cc57e96220cd3ed915875f3b1eeb2ba1f98a30 (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/nix-store/nix-store.cc')
-rw-r--r-- | src/nix-store/nix-store.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 4fc3421c0dde..4bea1316134e 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -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(); } |