diff options
| author | Ben Burdette <bburdette@gmail.com> | 2020-06-23 09:40:28 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@gmail.com> | 2020-06-23 09:40:28 -0600 |
| commit | abe0552504b067bb5edd95dadaf714db6d2843b6 (patch) | |
| tree | 2e834a819a8be09e0e4dab712d8cfafc5ba859be /src/libstore/nar-info-disk-cache.cc | |
| parent | 13e87535ffa195690213ed656e2b61218c6894a3 (diff) | |
| parent | 015e1c2131de938d61fa50c8df9d3987c42bcb39 (diff) | |
Merge remote-tracking branch 'upstream/master' into add-trace
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 552970248..012dea6ea 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 { |