diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-03 17:08:39 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-03 17:08:39 +0000 |
| commit | 465daa9396a0e4203fb8f575da219ea79c5fefa8 (patch) | |
| tree | 3237c125d59b88366d457503d277cbbdd4b3106d /src/libstore/legacy-ssh-store.cc | |
| parent | 1b23fe4afb8ed2c41604a1ed19cf3d49c34f46d1 (diff) | |
| parent | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (diff) | |
Merge remote-tracking branch 'upstream/master' into add-body-to-network-errors
Diffstat (limited to 'src/libstore/legacy-ssh-store.cc')
| -rw-r--r-- | src/libstore/legacy-ssh-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 45c70fad6..5657aa593 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -114,7 +114,7 @@ struct LegacySSHStore : public Store if (GET_PROTOCOL_MINOR(conn->remoteVersion) >= 4) { auto s = readString(conn->from); info->narHash = s.empty() ? Hash() : Hash(s); - conn->from >> info->ca; + info->ca = parseContentAddressOpt(readString(conn->from)); info->sigs = readStrings<StringSet>(conn->from); } @@ -146,7 +146,7 @@ struct LegacySSHStore : public Store << info.narSize << info.ultimate << info.sigs - << info.ca; + << renderContentAddress(info.ca); try { copyNAR(source, conn->to); } catch (...) { |