mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
Merge pull request #10293 from NixOS/fix-missing-format-arg
EvalCache: Fix missing format string argument
This commit is contained in:
commit
f891673460
1 changed files with 2 additions and 2 deletions
|
@ -581,7 +581,7 @@ std::string AttrCursor::getString()
|
||||||
auto & v = forceValue();
|
auto & v = forceValue();
|
||||||
|
|
||||||
if (v.type() != nString && v.type() != nPath)
|
if (v.type() != nString && v.type() != nPath)
|
||||||
root->state.error<TypeError>("'%s' is not a string but %s", getAttrPathStr()).debugThrow();
|
root->state.error<TypeError>("'%s' is not a string but %s", getAttrPathStr(), showType(v)).debugThrow();
|
||||||
|
|
||||||
return v.type() == nString ? v.c_str() : v.path().to_string();
|
return v.type() == nString ? v.c_str() : v.path().to_string();
|
||||||
}
|
}
|
||||||
|
@ -630,7 +630,7 @@ string_t AttrCursor::getStringWithContext()
|
||||||
else if (v.type() == nPath)
|
else if (v.type() == nPath)
|
||||||
return {v.path().to_string(), {}};
|
return {v.path().to_string(), {}};
|
||||||
else
|
else
|
||||||
root->state.error<TypeError>("'%s' is not a string but %s", getAttrPathStr()).debugThrow();
|
root->state.error<TypeError>("'%s' is not a string but %s", getAttrPathStr(), showType(v)).debugThrow();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AttrCursor::getBool()
|
bool AttrCursor::getBool()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue