aboutsummaryrefslogtreecommitdiff
path: root/src/libfetchers
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-06-22 14:34:00 +0200
committerGitHub <noreply@github.com>2020-06-22 14:34:00 +0200
commit965b80347e97169f266466603e29a57359c4083c (patch)
tree8dfd5a8167d96481860a270ba8bfeda922906c47 /src/libfetchers
parent984e521392b3f41f7cdab203e5c00f3e00e27a28 (diff)
parente288c0987a45247254fe0e501459db247ec8f72b (diff)
Merge pull request #3649 from obsidiansystems/validPathInfo-ca-proper-datatype
ValidPathInfo: make ca field a proper datatype
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);