mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #925 from abbradar/master

Browse source 
Show both cycle ends
This commit is contained in:
Eelco Dolstra 2016-06-03 13:58:51 +02:00
commit a8dfdc52b8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/misc.cc
View file

@ -169,11 +169,11 @@ Paths Store::topoSortPaths(const PathSet & paths)
Paths sorted; Paths sorted;
PathSet visited, parents; PathSet visited, parents;
std::function<void(const Path & path)> dfsVisit; std::function<void(const Path & path, const Path * parent)> dfsVisit;
dfsVisit = [&](const Path & path) { dfsVisit = [&](const Path & path, const Path * parent) {
if (parents.find(path) != parents.end()) if (parents.find(path) != parents.end())
throw BuildError(format("cycle detected in the references of ‘%1%’") % path); throw BuildError(format("cycle detected in the references of '%1%' from '%2%'") % path % *parent);
if (visited.find(path) != visited.end()) return; if (visited.find(path) != visited.end()) return;
visited.insert(path); visited.insert(path);
@ -189,14 +189,14 @@ Paths Store::topoSortPaths(const PathSet & paths)
/* Don't traverse into paths that don't exist. That can /* Don't traverse into paths that don't exist. That can
happen due to substitutes for non-existent paths. */ happen due to substitutes for non-existent paths. */
if (i != path && paths.find(i) != paths.end()) if (i != path && paths.find(i) != paths.end())
dfsVisit(i); dfsVisit(i, &path);
sorted.push_front(path); sorted.push_front(path);
parents.erase(path); parents.erase(path);
}; };
for (auto & i : paths) for (auto & i : paths)
dfsVisit(i); dfsVisit(i, nullptr);
return sorted; return sorted;
} }