lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #7889 from sidkshatriya/sorted-fetch-paths

Browse source 
Print the store paths to be fetched sorted by StorePath name()
This commit is contained in:
Théophane Hufschmitt 2023-03-07 11:58:10 +01:00 committed by GitHub
parent 02bf521968 427555861b
commit ba0486f045
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libmain/shared.cc
View file

@ -84,8 +84,18 @@ void printMissing(ref<Store> store, const StorePathSet & willBuild,
downloadSizeMiB, downloadSizeMiB,
narSizeMiB); narSizeMiB);
} }
for (auto & i : willSubstitute) std::vector<const StorePath *> willSubstituteSorted = {};
printMsg(lvl, " %s", store->printStorePath(i)); std::for_each(willSubstitute.begin(), willSubstitute.end(),
[&](const StorePath &p) { willSubstituteSorted.push_back(&p); });
std::sort(willSubstituteSorted.begin(), willSubstituteSorted.end(),
[](const StorePath *lhs, const StorePath *rhs) {
if (lhs->name() == rhs->name())
return lhs->to_string() < rhs->to_string();
else
return lhs->name() < rhs->name();
});
for (auto p : willSubstituteSorted)
printMsg(lvl, " %s", store->printStorePath(*p));
} }
if (!unknown.empty()) { if (!unknown.empty()) {