[OE-core] [PATCH] report-error: Add a check for binary log file

Michael Wood michael.g.wood at intel.com
Thu Jan 29 16:36:09 UTC 2015


Check to see if the log file is a binary. If it is do not try to submit
it in our error-report.

[YOCTO #7263]

Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
 meta/classes/report-error.bbclass | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
index 8b30422..101fe9b 100644
--- a/meta/classes/report-error.bbclass
+++ b/meta/classes/report-error.bbclass
@@ -24,6 +24,15 @@ def errorreport_savedata(e, newdata, file):
         json.dump(newdata, f, indent=4, sort_keys=True)
     return datafile
 
+def errorreport_testlogforbinary(data):
+    for c in data:
+      # If the data contains non visible character below 10 it's a binary
+      if (ord(c) < 10):
+        return True
+
+    return False
+
+
 python errorreport_handler () {
         import json
 
@@ -48,7 +57,13 @@ python errorreport_handler () {
             taskdata['task'] = task
             if log:
                 logFile = open(log, 'r')
-                taskdata['log'] = logFile.read()
+                # Detect binary log output
+                logdata = logFile.read()
+                if  errorreport_testlogforbinary(logdata):
+                    taskdata['log'] = "Log in binary format"
+                else:
+                    taskdata['log'] = logdata
+
                 logFile.close()
             else:
                 taskdata['log'] = "No Log"
-- 
2.1.0




More information about the Openembedded-core mailing list