summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-03-14 17:33:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-15 21:47:42 +0000
commita9098e642367a775c60dbb677cbf041eaf53cf83 (patch)
tree5528f81634af38bb953fd387a055210637d4c3d2 /bitbake
parent9fbbf40317743beacd8ac9d3f602765ed9d9fa6f (diff)
downloadpoky-a9098e642367a775c60dbb677cbf041eaf53cf83.tar.gz
bitbake: codeparser: Fix TypeError in bitbake debug mode
Commit 75f87db413 fixed the confusion between bitbake and python logger but in codeparser still old method of setting debug level was used causing TypeError, because debug level value was incorrectly returned and assigned to event.msg. | File "./bitbake/lib/bb/ui/knotty.py", line 660, in main | event.msg = event.fn + ': ' + event.msg | TypeError: can only concatenate str (not "int") to str [YOCTO #14298] (Bitbake rev: bec9ea7ab28a8dfad1a6010ca5c6ec691754748d) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/codeparser.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py
index 25a7ac69d3..0cec452c00 100644
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -212,9 +212,9 @@ class PythonParser():
212 funcstr = codegen.to_source(func) 212 funcstr = codegen.to_source(func)
213 argstr = codegen.to_source(arg) 213 argstr = codegen.to_source(arg)
214 except TypeError: 214 except TypeError:
215 self.log.debug(2, 'Failed to convert function and argument to source form') 215 self.log.debug2('Failed to convert function and argument to source form')
216 else: 216 else:
217 self.log.debug(1, self.unhandled_message % (funcstr, argstr)) 217 self.log.debug(self.unhandled_message % (funcstr, argstr))
218 218
219 def visit_Call(self, node): 219 def visit_Call(self, node):
220 name = self.called_node_name(node.func) 220 name = self.called_node_name(node.func)
@@ -450,7 +450,7 @@ class ShellParser():
450 450
451 cmd = word[1] 451 cmd = word[1]
452 if cmd.startswith("$"): 452 if cmd.startswith("$"):
453 self.log.debug(1, self.unhandled_template % cmd) 453 self.log.debug(self.unhandled_template % cmd)
454 elif cmd == "eval": 454 elif cmd == "eval":
455 command = " ".join(word for _, word in words[1:]) 455 command = " ".join(word for _, word in words[1:])
456 self._parse_shell(command) 456 self._parse_shell(command)