maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LocalStore::querySubstitutablePaths(): Implement using queryValidPaths()

Browse source
This commit is contained in:
Eelco Dolstra 2016-10-07 19:46:56 +02:00
parent 844219f364
commit 0c85ef7090
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/local-store.cc
View file

@ -783,15 +783,11 @@ PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
if (!settings.useSubstitutes) return PathSet(); if (!settings.useSubstitutes) return PathSet();
PathSet res; PathSet res;
for (auto & sub : getDefaultSubstituters()) { for (auto & sub : getDefaultSubstituters()) {
if (res.size() == paths.size()) break;
if (sub->storeDir != storeDir) continue; if (sub->storeDir != storeDir) continue;
if (!sub->wantMassQuery()) continue; if (!sub->wantMassQuery()) continue;
for (auto & path : paths) { for (auto path : sub->queryValidPaths(paths))
if (res.count(path)) continue; res.insert(path);
debug(format("checking substituter ‘%s’ for path ‘%s’")
% sub->getUri() % path);
if (sub->isValidPath(path))
res.insert(path);
}
} }
return res; return res;
} }