diff options
| author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-05 15:45:33 -0400 |
|---|---|---|
| committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-05 15:45:33 -0400 |
| commit | 1d2e80ddd669ef6da94c0f8c8ad734c1b0cf7d10 (patch) | |
| tree | 5d114e6ef82f978857763fd2ee800c00f7c632cd /src/libstore/binary-cache-store.cc | |
| parent | c318d398f37714c98f16b83d3afcafa856f91266 (diff) | |
| parent | b3e73547a03f068ae4dd9cca4bc865cde85c8dec (diff) | |
Merge branch 'master' of github.com:NixOS/nix into new-interface-for-path-pathOpt
Diffstat (limited to 'src/libstore/binary-cache-store.cc')
| -rw-r--r-- | src/libstore/binary-cache-store.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 30150eeba..9682db730 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -153,6 +153,8 @@ void BinaryCacheStore::addToStore(const ValidPathInfo & info, Source & narSource auto [fdTemp, fnTemp] = createTempFile(); + AutoDelete autoDelete(fnTemp); + auto now1 = std::chrono::steady_clock::now(); /* Read the NAR simultaneously into a CompressionSink+FileSink (to @@ -167,6 +169,7 @@ void BinaryCacheStore::addToStore(const ValidPathInfo & info, Source & narSource TeeSource teeSource(narSource, *compressionSink); narAccessor = makeNarAccessor(teeSource); compressionSink->finish(); + fileSink.flush(); } auto now2 = std::chrono::steady_clock::now(); @@ -280,7 +283,7 @@ void BinaryCacheStore::addToStore(const ValidPathInfo & info, Source & narSource if (repair || !fileExists(narInfo->url)) { stats.narWrite++; upsertFile(narInfo->url, - std::make_shared<std::fstream>(fnTemp, std::ios_base::in), + std::make_shared<std::fstream>(fnTemp, std::ios_base::in | std::ios_base::binary), "application/x-nix-nar"); } else stats.narWriteAverted++; |