From 9d7221183a6825d798267288ebe7d3e2adcd8cde Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 10 Mar 2019 00:04:37 +0100 Subject: [PATCH] unify naming of roots as links & targets --- src/nix-store/nix-store.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 11d0d573f..b5530b39e 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -428,10 +428,10 @@ static void opQuery(Strings opFlags, Strings opArgs) referrers, true, settings.gcKeepOutputs, settings.gcKeepDerivations); } Roots roots = store->findRoots(); - for (auto & [path, links] : roots) - if (referrers.find(path) != referrers.end()) + for (auto & [target, links] : roots) + if (referrers.find(target) != referrers.end()) for (auto & link : links) - cout << format("%1% -> %2%\n") % link % path; + cout << format("%1% -> %2%\n") % link % target; break; } @@ -592,9 +592,9 @@ static void opGC(Strings opFlags, Strings opArgs) if (printRoots) { Roots roots = store->findRoots(); - for (auto & [path, roots] : roots) - for (auto & root : roots) - cout << root << " -> " << path << std::endl; + for (auto & [target, links] : roots) + for (auto & link : links) + cout << link << " -> " << target << std::endl; } else {