aboutsummaryrefslogtreecommitdiff
path: root/src/libfetchers
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-06-22 13:08:11 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2020-06-22 13:08:11 -0400
commit66a62b3189c8c9b0965850e6b3c9b0fda0b50fd8 (patch)
tree70a25a2cb1973a05559eca3134979fc8be873aca /src/libfetchers
parentf2a6cee334255ced72a70f527cf3c283b4586e42 (diff)
parent965b80347e97169f266466603e29a57359c4083c (diff)
Merge remote-tracking branch 'origin/master' into substitute-other-storedir
Diffstat (limited to 'src/libfetchers')
-rw-r--r--src/libfetchers/tarball.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index ac83d52b9..f5356f0af 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -70,7 +70,10 @@ DownloadFileResult downloadFile(
ValidPathInfo info(store->makeFixedOutputPath(FileIngestionMethod::Flat, hash, name));
info.narHash = hashString(htSHA256, *sink.s);
info.narSize = sink.s->size();
- info.ca = makeFixedOutputCA(FileIngestionMethod::Flat, hash);
+ info.ca = FixedOutputHash {
+ .method = FileIngestionMethod::Flat,
+ .hash = hash,
+ };
auto source = StringSource { *sink.s };
store->addToStore(info, source, NoRepair, NoCheckSigs);
storePath = std::move(info.path);