diff options
author | Ben Burdette <bburdette@gmail.com> | 2020-06-11 14:06:35 -0600 |
---|---|---|
committer | Ben Burdette <bburdette@gmail.com> | 2020-06-11 14:06:35 -0600 |
commit | ef1b3f21b6e51007d82e8e894dd9ecec0d1c5207 (patch) | |
tree | 28ec34c71e98779d0b655a0b8e9070b981ee0cd9 /src/libstore/nar-info-disk-cache.cc | |
parent | 94c347577ecea5dcd10a31ebfadf94db6ca5ab0d (diff) | |
parent | ac4d43a31bb32c1205b44d69e87606b7f54922a1 (diff) |
Merge remote-tracking branch 'upstream/master' into errors-phase-2
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 442541330..e8cf1d177 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -230,9 +230,9 @@ public: (std::string(info->path.name())) (narInfo ? narInfo->url : "", narInfo != 0) (narInfo ? narInfo->compression : "", narInfo != 0) - (narInfo && narInfo->fileHash ? narInfo->fileHash.to_string() : "", narInfo && narInfo->fileHash) + (narInfo && narInfo->fileHash ? narInfo->fileHash.to_string(Base32, true) : "", narInfo && narInfo->fileHash) (narInfo ? narInfo->fileSize : 0, narInfo != 0 && narInfo->fileSize) - (info->narHash.to_string()) + (info->narHash.to_string(Base32, true)) (info->narSize) (concatStringsSep(" ", info->shortRefs())) (info->deriver ? std::string(info->deriver->to_string()) : "", (bool) info->deriver) |