diff options
| author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-07-31 13:12:51 -0400 |
|---|---|---|
| committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-07-31 13:12:51 -0400 |
| commit | b6d97fdbf4f668d72e93e94e956a19ddb299bcd2 (patch) | |
| tree | 56cfa7cf92b3684d24f7f0c3ed7c4637e54b499f /src/libstore/legacy-ssh-store.cc | |
| parent | 2c7557481b4c9d5113a65cc7a75c8acc18031f4e (diff) | |
| parent | a3f9625818ecb0c8a3c22c191340dac5a3120bb5 (diff) | |
Merge branch 'master' of github.com:NixOS/nix into drv-outputs-map-allow-missing
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 a8bd8a972..5d7566121 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -113,7 +113,7 @@ struct LegacySSHStore : public Store if (GET_PROTOCOL_MINOR(conn->remoteVersion) >= 4) { auto s = readString(conn->from); - info->narHash = s.empty() ? Hash() : Hash(s); + info->narHash = s.empty() ? std::optional<Hash>{} : Hash{s}; info->ca = parseContentAddressOpt(readString(conn->from)); info->sigs = readStrings<StringSet>(conn->from); } @@ -138,7 +138,7 @@ struct LegacySSHStore : public Store << cmdAddToStoreNar << printStorePath(info.path) << (info.deriver ? printStorePath(*info.deriver) : "") - << info.narHash.to_string(Base16, false); + << info.narHash->to_string(Base16, false); writeStorePaths(*this, conn->to, info.references); conn->to << info.registrationTime |