diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-23 17:03:10 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-23 17:03:37 +0000 |
| commit | 98e5d1af03d1045ec1874c94b88cc21a727e28f2 (patch) | |
| tree | 46a426c84272d8118d3d7757986996cb9a565a81 /src/libstore/nar-info-disk-cache.cc | |
| parent | 3dc10f73931d6eaa41e28a4d763a2dc3965fd6c3 (diff) | |
| parent | 015e1c2131de938d61fa50c8df9d3987c42bcb39 (diff) | |
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
Diffstat (limited to 'src/libstore/nar-info-disk-cache.cc')
| -rw-r--r-- | src/libstore/nar-info-disk-cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc index 6036b905e..9ddb9957f 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -203,7 +203,7 @@ public: narInfo->deriver = StorePath(queryNAR.getStr(9)); for (auto & sig : tokenizeString<Strings>(queryNAR.getStr(10), " ")) narInfo->sigs.insert(sig); - narInfo->ca = queryNAR.getStr(11); + narInfo->ca = parseContentAddressOpt(queryNAR.getStr(11)); return {oValid, narInfo}; }); @@ -237,7 +237,7 @@ public: (concatStringsSep(" ", info->shortRefs())) (info->deriver ? std::string(info->deriver->to_string()) : "", (bool) info->deriver) (concatStringsSep(" ", info->sigs)) - (info->ca) + (renderContentAddress(info->ca)) (time(0)).exec(); } else { |