lix-project/lix
20
58
Fork 31
Code Issues 355 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libcmd: make a back-compat hack more robust

Browse source 
otherwise eval fails if getEvalState runs before parseInstallables runs.

Change-Id: Ia0d66dd6297212f7835c4a9b2db0fb4d9e4c9b9d
This commit is contained in:
eldritch horrors 2024-12-03 20:38:41 +01:00
parent 9a3e3a5560
commit a5d02bcdf9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lix/libcmd/installables.cc
View file

@ -214,6 +214,8 @@ void SourceExprCommand::completeInstallable(AddCompletions & completions, std::s
evalSettings.pureEval.override(false); evalSettings.pureEval.override(false);
auto state = getEvalState(); auto state = getEvalState();
state->paths.allowedPaths.reset();
Expr & e = state->parseExprFromFile( Expr & e = state->parseExprFromFile(
resolveExprPath(state->paths.checkSourcePath(lookupFileArg(*state, *file))) resolveExprPath(state->paths.checkSourcePath(lookupFileArg(*state, *file)))
); );
@ -431,7 +433,10 @@ Installables SourceExprCommand::parseInstallables(
throw UsageError("'--file' and '--expr' are exclusive"); throw UsageError("'--file' and '--expr' are exclusive");
// FIXME: backward compatibility hack // FIXME: backward compatibility hack
if (file) evalSettings.pureEval.override(false); if (file) {
evalSettings.pureEval.override(false);
getEvalState()->paths.allowedPaths.reset();
}
auto state = getEvalState(); auto state = getEvalState();
auto vFile = state->mem.allocValue(); auto vFile = state->mem.allocValue();