From ab7c1d239b122c8e549e8112c88fd46c9e2b061b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Jun 2015 15:14:16 +0100 Subject: meta: Add explict getVar param for (non) expansion Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` Signed-off-by: Richard Purdie --- meta/classes/report-error.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/classes/report-error.bbclass') diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 9edf2ceb31..c5aaaa8a11 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -29,11 +29,11 @@ python errorreport_handler () { if isinstance(e, bb.event.BuildStarted): data = {} - machine = e.data.getVar("MACHINE") + machine = e.data.getVar("MACHINE", False) data['machine'] = machine data['build_sys'] = e.data.getVar("BUILD_SYS", True) - data['nativelsb'] = e.data.getVar("NATIVELSBSTRING") - data['distro'] = e.data.getVar("DISTRO") + data['nativelsb'] = e.data.getVar("NATIVELSBSTRING", False) + data['distro'] = e.data.getVar("DISTRO", False) data['target_sys'] = e.data.getVar("TARGET_SYS", True) data['failures'] = [] data['component'] = e.getPkgs()[0] @@ -64,7 +64,7 @@ python errorreport_handler () { jsondata = json.loads(errorreport_getdata(e)) failures = jsondata['failures'] if(len(failures) > 0): - filename = "error_report_" + e.data.getVar("BUILDNAME")+".txt" + filename = "error_report_" + e.data.getVar("BUILDNAME", False)+".txt" datafile = errorreport_savedata(e, jsondata, filename) bb.note("The errors for this build are stored in %s\nYou can send the errors to a reports server by running:\n send-error-report %s [-s server]" % (datafile, datafile)) bb.note("The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.") -- cgit 1.2.3-korg