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/libexpr/primops | |
| parent | 94c347577ecea5dcd10a31ebfadf94db6ca5ab0d (diff) | |
| parent | ac4d43a31bb32c1205b44d69e87606b7f54922a1 (diff) | |
Merge remote-tracking branch 'upstream/master' into errors-phase-2
Diffstat (limited to 'src/libexpr/primops')
| -rw-r--r-- | src/libexpr/primops/fetchTree.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index af3b61d6a..5a86fb625 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -23,7 +23,7 @@ void emitTreeAttrs( assert(tree.info.narHash); mkString(*state.allocAttr(v, state.symbols.create("narHash")), - tree.info.narHash.to_string(SRI)); + tree.info.narHash.to_string(SRI, true)); if (input->getRev()) { mkString(*state.allocAttr(v, state.symbols.create("rev")), input->getRev()->gitRev()); @@ -151,7 +151,7 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v, : hashFile(htSHA256, path); if (hash != *expectedHash) throw Error((unsigned int) 102, "hash mismatch in file downloaded from '%s':\n wanted: %s\n got: %s", - *url, expectedHash->to_string(), hash.to_string()); + *url, expectedHash->to_string(Base32, true), hash.to_string(Base32, true)); } if (state.allowedPaths) |