eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix assertion failure in LockFile::LockFile()

Browse source 
Fixes #4241.
This commit is contained in:
Eelco Dolstra 2020-11-19 20:30:41 +01:00
parent bc4df3394d
commit 0327580e54
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/flake/lockfile.cc
View file

@ -78,7 +78,7 @@ LockFile::LockFile(const nlohmann::json & json, const Path & path)
{ {
if (jsonNode.find("inputs") == jsonNode.end()) return; if (jsonNode.find("inputs") == jsonNode.end()) return;
for (auto & i : jsonNode["inputs"].items()) { for (auto & i : jsonNode["inputs"].items()) {
if (i.value().is_array()) { if (i.value().is_array()) { // FIXME: remove, obsolete
InputPath path; InputPath path;
for (auto & j : i.value()) for (auto & j : i.value())
path.push_back(j); path.push_back(j);
@ -87,10 +87,13 @@ LockFile::LockFile(const nlohmann::json & json, const Path & path)
std::string inputKey = i.value(); std::string inputKey = i.value();
auto k = nodeMap.find(inputKey); auto k = nodeMap.find(inputKey);
if (k == nodeMap.end()) { if (k == nodeMap.end()) {
auto jsonNode2 = json["nodes"][inputKey]; auto nodes = json["nodes"];
auto input = std::make_shared<LockedNode>(jsonNode2); auto jsonNode2 = nodes.find(inputKey);
if (jsonNode2 == nodes.end())
throw Error("lock file references missing node '%s'", inputKey);
auto input = std::make_shared<LockedNode>(*jsonNode2);
k = nodeMap.insert_or_assign(inputKey, input).first; k = nodeMap.insert_or_assign(inputKey, input).first;
getInputs(*input, jsonNode2); getInputs(*input, *jsonNode2);
} }
if (auto child = std::dynamic_pointer_cast<LockedNode>(k->second)) if (auto child = std::dynamic_pointer_cast<LockedNode>(k->second))
node.inputs.insert_or_assign(i.key(), child); node.inputs.insert_or_assign(i.key(), child);