wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Code Activity

WIP

Browse source
This commit is contained in:
John Ericson 2020-06-02 00:37:43 +00:00
parent 754c910953
commit efcd30da89
17 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/legacy-ssh-store.cc
View file

@ -114,7 +114,11 @@ 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;
{
std::string rawCaOpt;
conn->from >> rawCaOpt;
info->ca = parseCaOpt(rawCaOpt);
}
info->sigs = readStrings<StringSet>(conn->from);
}
@ -146,7 +150,7 @@ struct LegacySSHStore : public Store
<< info.narSize
<< info.ultimate
<< info.sigs
<< info.ca;
<< renderContentAddress(info.ca);
try {
copyNAR(source, conn->to);
} catch (...) {