summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-07-26 13:33:58 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-07-26 13:36:22 +0200
commit9ddcebcb6ea75c3c22187e11c2c1076a86f1af8b (patch)
treebce51a70864929f1e3de6080158a68a46b94fc6d /src
parent04dc6c632f7bc85b48d12af695392fb5e4d0faef (diff)
downloadluaotfload-9ddcebcb6ea75c3c22187e11c2c1076a86f1af8b.tar.gz
[db,tool,conf] fix thinko in db update suppression
The ``db.update-live`` option caused all db updates, even forced ones to fail due to a missing check for the kind of run.
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-configuration.lua2
-rw-r--r--src/luaotfload-database.lua6
-rwxr-xr-xsrc/luaotfload-tool.lua2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index dfa222c..f24f595 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -148,6 +148,7 @@ local default_config = {
definer = "patch",
log_level = 0,
color_callback = "pre_linebreak_filter",
+ live = true,
},
misc = {
bisect = false,
@@ -419,6 +420,7 @@ local option_spec = {
},
},
run = {
+ live = { in_t = boolean_t, }, --- false for the tool, true for TeX run
resolver = {
in_t = string_t,
out_t = string_t,
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 4c5522e..099c256 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -3091,9 +3091,9 @@ end
update_names = function (currentnames, force, dry_run)
local targetnames
- if config.luaotfload.db.update_live == false then
- report ("info", 2, "db",
- "Skipping database update.")
+ local conf = config.luaotfload
+ if conf.run.live ~= false and conf.db.update_live == false then
+ report ("info", 2, "db", "Skipping database update.")
--- skip all db updates
return currentnames or name_index
end
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index 754f5c7..f99b47b 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -1405,7 +1405,7 @@ local process_cmdline = function ( ) -- unit -> jobspec
query = "",
log_level = nil,
bisect = nil,
- config = { db = { }, misc = { }, run = { }, paths = { } },
+ config = { db = { }, misc = { }, run = { live = false }, paths = { } },
}
local long_options = {