summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-11-17 22:33:04 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2015-11-17 22:35:18 +0100
commit6e2184e0226de1e76e7195493b781b99f56eb879 (patch)
treed5ed6dee41971a685da8be72c40be06e687f1883
parentd8f160fc0518155a9ae995dfb16fc0d29937aa7c (diff)
downloadluaotfload-6e2184e0226de1e76e7195493b781b99f56eb879.tar.gz
[conf] return path instead of pair to prevent type-mismatch
The (fontloader, path) return value cannot pass the post-config validation because the value of ``run.fontloader`` is of type string. Since the path is always checked during configuration we can just forward it as-is and attempt a path load later on.
-rw-r--r--src/luaotfload-configuration.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index 0ce9467..efed573 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -148,12 +148,12 @@ local pick_fontloader = function (s)
logreport ("log", 2, "conf", "Context base path specified at \"%s\".", pth)
if lfsisdir (pth) then
logreport ("log", 5, "conf", "Context base path exists at \"%s\".", pth)
- return { "context", pth }
+ return pth
end
pth = kpseexpand_path (pth)
if lfsisdir (pth) then
logreport ("log", 5, "conf", "Context base path exists at \"%s\".", pth)
- return { "context", pth }
+ return pth
end
logreport ("both", 0, "conf", "Context base path not found at \"%s\".", pth)
end