Remove obsolete EOF checks
This commit is contained in:
parent
5959c591a0
commit
ca70fba0bf
1 changed files with 18 additions and 26 deletions
|
@ -1122,13 +1122,9 @@ PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
|
||||||
substituters should only write (short) messages to
|
substituters should only write (short) messages to
|
||||||
stderr when they fail. I.e. they shouldn't write debug
|
stderr when they fail. I.e. they shouldn't write debug
|
||||||
output. */
|
output. */
|
||||||
try {
|
Path path = getLineFromSubstituter(run);
|
||||||
Path path = getLineFromSubstituter(run);
|
if (path == "") break;
|
||||||
if (path == "") break;
|
res.insert(path);
|
||||||
res.insert(path);
|
|
||||||
} catch (EndOfFile e) {
|
|
||||||
throw Error(format("substituter `%1%' failed: %2%") % *i % chomp(drainFD(run.error)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
|
@ -1147,26 +1143,22 @@ void LocalStore::querySubstitutablePathInfos(const Path & substituter,
|
||||||
writeLine(run.to, s);
|
writeLine(run.to, s);
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
try {
|
Path path = getLineFromSubstituter(run);
|
||||||
Path path = getLineFromSubstituter(run);
|
if (path == "") break;
|
||||||
if (path == "") break;
|
if (paths.find(path) == paths.end())
|
||||||
if (paths.find(path) == paths.end())
|
throw Error(format("got unexpected path `%1%' from substituter") % path);
|
||||||
throw Error(format("got unexpected path `%1%' from substituter") % path);
|
paths.erase(path);
|
||||||
paths.erase(path);
|
SubstitutablePathInfo & info(infos[path]);
|
||||||
SubstitutablePathInfo & info(infos[path]);
|
info.deriver = getLineFromSubstituter(run);
|
||||||
info.deriver = getLineFromSubstituter(run);
|
if (info.deriver != "") assertStorePath(info.deriver);
|
||||||
if (info.deriver != "") assertStorePath(info.deriver);
|
int nrRefs = getIntLineFromSubstituter<int>(run);
|
||||||
int nrRefs = getIntLineFromSubstituter<int>(run);
|
while (nrRefs--) {
|
||||||
while (nrRefs--) {
|
Path p = getLineFromSubstituter(run);
|
||||||
Path p = getLineFromSubstituter(run);
|
assertStorePath(p);
|
||||||
assertStorePath(p);
|
info.references.insert(p);
|
||||||
info.references.insert(p);
|
|
||||||
}
|
|
||||||
info.downloadSize = getIntLineFromSubstituter<long long>(run);
|
|
||||||
info.narSize = getIntLineFromSubstituter<long long>(run);
|
|
||||||
} catch (EndOfFile e) {
|
|
||||||
throw Error(format("substituter `%1%' failed: %2%") % substituter % chomp(drainFD(run.error)));
|
|
||||||
}
|
}
|
||||||
|
info.downloadSize = getIntLineFromSubstituter<long long>(run);
|
||||||
|
info.narSize = getIntLineFromSubstituter<long long>(run);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue