diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-26 08:46:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-26 08:46:46 +0200 |
| commit | adf2fbbdc2c94644b0d1023d844c7dc0e485a20f (patch) | |
| tree | 5999d2c223cb24402995747d79a3de6d6aaebb73 /src/libstore/nar-info.cc | |
| parent | 09fc06daab280735dd2ec94276f00a9c5bffd9b2 (diff) | |
| parent | b7ccf7ae2af3d7eaf3696358ecbbce5a2bcfe652 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/nar-info.cc')
| -rw-r--r-- | src/libstore/nar-info.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc index bb4448c90..04550ed97 100644 --- a/src/libstore/nar-info.cc +++ b/src/libstore/nar-info.cc @@ -67,8 +67,9 @@ NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & else if (name == "Sig") sigs.insert(value); else if (name == "CA") { - if (!ca.empty()) corrupt(); - ca = value; + if (ca) corrupt(); + // FIXME: allow blank ca or require skipping field? + ca = parseContentAddressOpt(value); } pos = eol + 1; @@ -104,8 +105,8 @@ std::string NarInfo::to_string(const Store & store) const for (auto sig : sigs) res += "Sig: " + sig + "\n"; - if (!ca.empty()) - res += "CA: " + ca + "\n"; + if (ca) + res += "CA: " + renderContentAddress(*ca) + "\n"; return res; } |