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/legacy-ssh-store.cc | |
| parent | 13e87535ffa195690213ed656e2b61218c6894a3 (diff) | |
| parent | 015e1c2131de938d61fa50c8df9d3987c42bcb39 (diff) | |
Merge remote-tracking branch 'upstream/master' into add-trace
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 (...) { |