Skip to contentSkip to conversation

Fix report-error BUILDNAME usage

PATCH New Paul Eggleton 1 participant 2 messages Jul 9, 2015

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Fix report-error BUILDNAME usage

The following changes since commit 50a37ee563d9003e21bfb9280f184cd81c62e9bf:

oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:03:07 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/report-error-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/report-error-fix

Paul Eggleton (1):
classes/report-error: expand variable values

 meta/classes/report-error.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/1 classes/report-error: expand variable values

Even if the values for these variables typically don't contain expressions, we should be expanding them just in case they do. The recent fix for BUILDNAME resetting within BitBake now means that BUILDNAME defaults to "${DATE}${TIME}" for example so we definitely need to expand that.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/report-error.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/report-error.bbclass +4 -4
index 11eee9b..dda0986 100644
@@ -32,11 +32,11 @@ python errorreport_handler () {
         if isinstance(e, bb.event.BuildStarted):
             bb.utils.mkdirhier(logpath)
             data = {}
-            machine = e.data.getVar("MACHINE", False)
+            machine = e.data.getVar("MACHINE", True)
             data['machine'] = machine
             data['build_sys'] = e.data.getVar("BUILD_SYS", True)
-            data['nativelsb'] = e.data.getVar("NATIVELSBSTRING", False)
-            data['distro'] = e.data.getVar("DISTRO", False)
+            data['nativelsb'] = e.data.getVar("NATIVELSBSTRING", True)
+            data['distro'] = e.data.getVar("DISTRO", True)
             data['target_sys'] = e.data.getVar("TARGET_SYS", True)
             data['failures'] = []
             data['component'] = e.getPkgs()[0]

@@ -73,7 +73,7 @@ python errorreport_handler () {
             bb.utils.unlockfile(lock)
             failures = jsondata['failures']
             if(len(failures) > 0):
-                filename = "error_report_" + e.data.getVar("BUILDNAME", False)+".txt"
+                filename = "error_report_" + e.data.getVar("BUILDNAME", True) + ".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.")
Signature · 1 line
2.1.0