guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libexpr: associate stores and repair flag with EvalContext

Browse Source 
Change-Id: I5fd911415707f0b250888dcabdf6290691fcdbf3
This commit is contained in:
eldritch horrors
2024-12-04 23:50:31 +00:00
parent d30027a37a
commit 5db5eed43d
14 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libexpr/eval-cache.cc
+5 -5
View File
@@ -585,7 +585,7 @@ string_t AttrCursor::getStringWithContext(EvalState & state)
return o.path;
},
}, c.raw);
if (!state.store->isValidPath(path)) {
if (!state.ctx.store->isValidPath(path)) {
valid = false;
break;
}
@@ -728,14 +728,14 @@ bool AttrCursor::isDerivation(EvalState & state)
StorePath AttrCursor::forceDerivation(EvalState & state)
{
auto aDrvPath = getAttr(state, "drvPath");
auto drvPath = state.store->parseStorePath(aDrvPath->getString(state));
if (!state.store->isValidPath(drvPath) && !settings.readOnlyMode) {
auto drvPath = state.ctx.store->parseStorePath(aDrvPath->getString(state));
if (!state.ctx.store->isValidPath(drvPath) && !settings.readOnlyMode) {
/* The eval cache contains 'drvPath', but the actual path has
been garbage-collected. So force it to be regenerated. */
aDrvPath->forceValue(state);
if (!state.store->isValidPath(drvPath))
if (!state.ctx.store->isValidPath(drvPath))
throw Error("don't know how to recreate store derivation '%s'!",
state.store->printStorePath(drvPath));
state.ctx.store->printStorePath(drvPath));
}
return drvPath;
}