b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use format strings, not concatenation, in error messages

Browse source
This commit is contained in:
Chuck 2019-09-06 09:51:08 -07:00 committed by Linus Heckemann
parent 4af8dbf896
commit 36c00c1080
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/installer/tools/nixos-option/nixos-option.cc
View file

@ -479,25 +479,25 @@ Value findAlongOptionPath(Context * ctx, std::string const & path)
auto const & attr = *i;
v = evaluateValue(ctx, &v);
if (attr.empty()) {
throw Error("empty attribute name in selection path '" + path + "'");
throw Error("empty attribute name in selection path '%s'", path);
}
if (isOption(ctx, v) && !last_attribute) {
Value getSubOptions =
evaluateValue(ctx, findAlongAttrPath(*ctx->state, "type.getSubOptions", *ctx->autoArgs, v));
if (getSubOptions.type != tLambda) {
throw Error("Option's type.getSubOptions isn't a function at '" + attr + "' in path '" + path + "'");
throw Error("Option's type.getSubOptions isn't a function at '%s' in path '%s'", attr, path);
}
Value emptyString{};
nix::mkString(emptyString, "");
ctx->state->callFunction(getSubOptions, emptyString, v, nix::Pos{});
// Note that we've consumed attr, but didn't actually use it.
} else if (v.type != tAttrs) {
throw Error("attribute '" + attr + "' in path '" + path +
"' attempts to index a value that should be a set but is " + showType(v));
throw Error("attribute '%s' in path '%s' attempts to index a value that should be a set but is %s", attr,
path, showType(v));
} else {
auto const & next = v.attrs->find(ctx->state->symbols.create(attr));
if (next == v.attrs->end()) {
throw Error("attribute '" + attr + "' in path '" + path + "' not found");
throw Error("attribute '%s' in path '%s' not found", attr, path);
}
v = *next->value;
}