Merge pull request #95718 from Infinisil/fixup-nonexistant-option-error

lib/modules: Fix nonexistant option error
This commit is contained in:
Maximilian Bosch 2020-08-18 11:12:39 +02:00 committed by GitHub
commit 30842d0263
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -115,8 +115,8 @@ rec {
checkUnmatched =
if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then
let inherit (head merged.unmatchedDefns) file prefix;
in throw "The option `${showOption prefix}' defined in `${file}' does not exist."
let firstDef = head merged.unmatchedDefns;
in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."
else null;
result = builtins.seq checkUnmatched {