From: Alexandru DAMIAN <alexandru.damian@intel.com>
Date: Wed, 18 Dec 2013 19:24:47 +0000 (+0000)
Subject: toaster.bbclass: fix crash on buildstats collection
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35044
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f2637ec8d1b8840c31255572b5cb058777382e7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

toaster.bbclass: fix crash on buildstats collection

Toaster needs buildstats to be enabled in order to
collect task statistics. The toaster.bbclass didn't
have a guard to stop task data collection if the buildstats
weren't enabled, leading to a crash.

This patch verifies that the task variables are defined before
trying to use them.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index e1a93b57022..7c404b9e65a 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -165,6 +165,9 @@ python toaster_collect_task_stats() {
     import bb.utils
     import os
 
+    if not e.data.getVar('BUILDSTATS_BASE', True):
+        return  # if we don't have buildstats, we cannot collect stats
+
     def _append_read_list(v):
         lock = bb.utils.lockfile(e.data.expand("${TOPDIR}/toaster.lock"), False, True)