From fcf94f9e8fb637a6b0d1d03a6a650c5e37d63c93 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sat, 26 Jul 2014 13:33:58 +0200
Subject: [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.
---
 src/luaotfload-configuration.lua | 2 ++
 src/luaotfload-database.lua      | 6 +++---
 src/luaotfload-tool.lua          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index 0b2da64..bf841f7 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -151,6 +151,7 @@ local default_config = {
     definer        = "patch",
     log_level      = 0,
     color_callback = "pre_linebreak_filter",
+    live           = true,
   },
   misc = {
     bisect         = false,
@@ -422,6 +423,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 02c5a45..2330aee 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -1411,7 +1411,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 = {
-- 
cgit v1.2.3