mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle queryPathInfo() failure from substituters when fallback is enabled

Browse source 
Fixes #1990.
This commit is contained in:
Eelco Dolstra 2018-09-07 16:35:48 +02:00
parent 91405986f4
commit 33c3f91885
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -3682,6 +3682,13 @@ void SubstitutionGoal::tryNext()
} catch (InvalidPath &) { } catch (InvalidPath &) {
tryNext(); tryNext();
return; return;
} catch (Error & e) {
if (settings.tryFallback) {
printError(e.what());
tryNext();
return;
}
throw;
} }
/* Update the total expected download size. */ /* Update the total expected download size. */

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

@ -880,6 +880,11 @@ void LocalStore::querySubstitutablePathInfos(const PathSet & paths,
narInfo ? narInfo->fileSize : 0, narInfo ? narInfo->fileSize : 0,
info->narSize}; info->narSize};
} catch (InvalidPath) { } catch (InvalidPath) {
} catch (Error & e) {
if (settings.tryFallback)
printError(e.what());
else
throw;
} }
} }
} }