Handle queryPathInfo() failure from substituters when fallback is enabled
Fixes #1990.
This commit is contained in:
parent
91405986f4
commit
33c3f91885
2 changed files with 12 additions and 0 deletions
|
@ -3682,6 +3682,13 @@ void SubstitutionGoal::tryNext()
|
|||
} catch (InvalidPath &) {
|
||||
tryNext();
|
||||
return;
|
||||
} catch (Error & e) {
|
||||
if (settings.tryFallback) {
|
||||
printError(e.what());
|
||||
tryNext();
|
||||
return;
|
||||
}
|
||||
throw;
|
||||
}
|
||||
|
||||
/* Update the total expected download size. */
|
||||
|
|
|
@ -880,6 +880,11 @@ void LocalStore::querySubstitutablePathInfos(const PathSet & paths,
|
|||
narInfo ? narInfo->fileSize : 0,
|
||||
info->narSize};
|
||||
} catch (InvalidPath) {
|
||||
} catch (Error & e) {
|
||||
if (settings.tryFallback)
|
||||
printError(e.what());
|
||||
else
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue