From: Tobias Ulmer Date: Tue, 7 Mar 2017 16:00:27 +0000 (+0100) Subject: move less interesting messages to log level 4 X-Git-Tag: e2factory-2.3.17~3 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=9dae43c8c11bb943595aa378f398b392553982b4;p=e2factory.git move less interesting messages to log level 4 Signed-off-by: Tobias Ulmer --- diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 89e30fc..ebfc703 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -471,7 +471,7 @@ function e2lib.init2() -- handle E2_SSH environment setting ssh = e2lib.globals.osenv["E2_SSH"] if ssh then - e2lib.logf(3, "using E2_SSH environment variable: %s", ssh) + e2lib.logf(4, "using E2_SSH environment variable: %s", ssh) rc, re = tools.set_tool("ssh", ssh) if not rc then return false, e:cat(re) @@ -982,7 +982,7 @@ function e2lib.get_global_config() e2lib.logf(4, "reading global config file: %s", path) local rc = e2lib.exists(path) if rc then - e2lib.logf(3, "using global config file: %s", path) + e2lib.logf(4, "using global config file: %s", path) rc, re = e2lib.dofile2(path, { config = function(x) data = x end }) if not rc then @@ -1024,7 +1024,7 @@ function e2lib.read_extension_config(root) return {} end - e2lib.logf(3, "reading extension file: %s", extension_config) + e2lib.logf(4, "reading extension file: %s", extension_config) local data = nil rc, re = e2lib.dofile2(extension_config, @@ -1424,7 +1424,7 @@ function e2lib.callcmd(argv, fdctv, workdir, envdict, nowait) local rc, re, pid local sync_pipes = {} - e2lib.logf(3, "calling %q in %q", table.concat(argv, " "), + e2lib.logf(4, "calling %q in %q", table.concat(argv, " "), workdir or "$PWD") rc, re = fd_parent_setup(fdctv) @@ -1496,13 +1496,13 @@ function e2lib.callcmd(argv, fdctv, workdir, envdict, nowait) return pid end - e2lib.logf(3, "waiting for %q", table.concat(argv, " ")) + e2lib.logf(4, "waiting for %q", table.concat(argv, " ")) rc, re = e2lib.wait(pid) if not rc then return false, re end - e2lib.logf(3, "command %q exit with return code %d", + e2lib.logf(4, "command %q exit with return code %d", table.concat(argv, " "), rc) return rc @@ -1818,7 +1818,7 @@ function e2lib.parse_e2versionfile(filename) l, filename) end - e2lib.logf(3, "using e2 branch %s tag %s", + e2lib.logf(4, "using e2 branch %s tag %s", version_table.branch, version_table.tag) return strict.lock(version_table) diff --git a/generic/e2option.lua b/generic/e2option.lua index 71e1012..0d3ed49 100644 --- a/generic/e2option.lua +++ b/generic/e2option.lua @@ -399,7 +399,7 @@ function e2option.parse(args) for k,v in ipairs(vals) do table.insert(t, string.format("[%d]=%q", k, v)) end - e2lib.logf(3, "e2option.parse(): %s", table.concat(t, ", ")) + e2lib.logf(4, "e2option.parse(): %s", table.concat(t, ", ")) if opts["Wdefault"] or opts["Wall"] then e2lib.globals.warn_category.WDEFAULT = true diff --git a/generic/tools.lua b/generic/tools.lua index 26b70c5..830cc2f 100644 --- a/generic/tools.lua +++ b/generic/tools.lua @@ -200,7 +200,7 @@ function tools.set_tool(name, value, flags) if type(flags) == "string" then toollist[name].flags = flags end - e2lib.logf(3, "setting tool: %s=%s flags=%s", name, toollist[name].name, + e2lib.logf(4, "setting tool: %s=%s flags=%s", name, toollist[name].name, toollist[name].flags) return true end @@ -231,7 +231,7 @@ function tools.add_tool(name, value, flags, optional) } local t = toollist[name] - e2lib.logf(3, "adding tool: %s=%s flags=%s optional=%s", name, t.name, + e2lib.logf(4, "adding tool: %s=%s flags=%s optional=%s", name, t.name, t.flags, tostring(t.optional)) return true diff --git a/local/e2build.lua b/local/e2build.lua index 6856395..bfc3fe8 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -716,7 +716,6 @@ end function e2build.build_process_class:_fix_permissions(res, return_flags) local rc, re, bc local e = err.new("fixing permissions failed") - e2lib.log(3, "fix permissions") e2tool.set_umask() bc = res:build_config() diff --git a/local/e2tool.lua b/local/e2tool.lua index 225c3ec..5259b1e 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -1332,7 +1332,7 @@ function e2tool.print_selection(resultvec) local f = settings:force_rebuild() and "[force rebuild]" or "" local p = settings:prep_playground() and "[playground]" or "" - e2lib.logf(3, "Selected result: %-20s %s %s %s", resultname, s, f, p) + e2lib.logf(4, "Selected result: %-20s %s %s %s", resultname, s, f, p) end return true end diff --git a/local/licence.lua b/local/licence.lua index 43b8749..53fc01b 100644 --- a/local/licence.lua +++ b/local/licence.lua @@ -124,7 +124,7 @@ function licence.load_licence_config() path = e2lib.join(e2tool.root(), "proj/licences") - e2lib.logf(3, "loading licence config %q", path) + e2lib.logf(4, "loading licence config %q", path) e = err.new("loading licence config %q failed", path) ltable = nil diff --git a/local/projenv.lua b/local/projenv.lua index de51d5b..9874537 100644 --- a/local/projenv.lua +++ b/local/projenv.lua @@ -70,7 +70,7 @@ function projenv.safe_global_res_env_table() end local function _load_env_config(file) - e2lib.logf(3, "loading environment: %s", file) + e2lib.logf(4, "loading environment: %s", file) local e = err.new("loading environment: %s", file) local rc, re local merge_error = false @@ -101,7 +101,7 @@ local function _load_env_config(file) if type(value) == "string" then - e2lib.logf(3, "global env: %-15s = %-15s", key, value) + e2lib.logf(4, "global env: %-15s = %-15s", key, value) projenv.get_global_env():set(key, value) else @@ -115,7 +115,7 @@ local function _load_env_config(file) return end - e2lib.logf(3, "result env: %-15s = %-15s [%s]", key1, value1, key) + e2lib.logf(4, "result env: %-15s = %-15s [%s]", key1, value1, key) projenv.get_result_env(key):set(key1, value1) end diff --git a/local/result.lua b/local/result.lua index 93034d1..d0ee445 100644 --- a/local/result.lua +++ b/local/result.lua @@ -775,7 +775,7 @@ function result.instantiate_object(rawres) rawres.type, rawres.name) end - e2lib.logf(3, "instantiating %s of type %s", rawres.name, rawres.type) + e2lib.logf(4, "instantiating %s of type %s", rawres.name, rawres.type) theclass = result_types[rawres.type] assertIsTable(theclass)