diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-07-08 11:53:44 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 13:10:24 +0100 |
| commit | d45f818026429b70d90fb3ae8e017db6516dca44 (patch) | |
| tree | 461eb31ab4ddb6154acdf4ccfe28aa1dd8f0a9d4 /meta | |
| parent | 4f6636be97e654c7f3d58e2649328b1dde8ef696 (diff) | |
| download | openembedded-core-contrib-d45f818026429b70d90fb3ae8e017db6516dca44.tar.gz | |
report-error: expand all variables
BUILDNAME is now composed from ${DATE} and ${TIME} so needs to be expanded to
useful. Whilst fixing this some other variables were explicitly not expanded
for no clear reason, so expand those too.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/report-error.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 11eee9bdc57..cabd98cc329 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -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.") |