From 03d01393d14b7b20dcb40ff89b1628883fd3b545 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 27 Jul 2015 13:55:52 +0300 Subject: toaster.bbclass: Fix ValueError Running "bitbake xxx:do_unpack" resulted in exception at the BuildCompleted event from toaster. The reason for this exception was usage of ':' as a field delimiter in toasterstatlist file. As target can optionally contain ':' suffix it caused split(':') to throw exception: File "toaster_collect_task_stats(e)", line 71, in toaster_collect_task_stats(e=) ValueError: too many values to unpack Fixed by changing delimiter ':' -> '::' Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index eeca9dedd2..d63cff532e 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -192,7 +192,7 @@ python toaster_collect_task_stats() { bn = get_bn(e) bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn) taskdir = os.path.join(bsdir, e.data.expand("${PF}")) - fout.write("%s:%s:%s:%s\n" % (e.taskfile, e.taskname, os.path.join(taskdir, e.task), e.data.expand("${PN}"))) + fout.write("%s::%s::%s::%s\n" % (e.taskfile, e.taskname, os.path.join(taskdir, e.task), e.data.expand("${PN}"))) bb.utils.unlockfile(lock) @@ -245,7 +245,7 @@ python toaster_collect_task_stats() { events = [] with open(os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist"), "r") as fin: for line in fin: - (taskfile, taskname, filename, recipename) = line.strip().split(":") + (taskfile, taskname, filename, recipename) = line.strip().split("::") events.append((taskfile, taskname, _read_stats(filename), recipename)) bb.event.fire(bb.event.MetadataEvent("BuildStatsList", events), e.data) os.unlink(os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist")) -- cgit 1.2.3-korg