From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 22 Mar 2012 09:55:34 +0000 (+0800)
Subject: insane.bbclass: maybe no log.do_compile or log.do_install
X-Git-Tag: 2015-4~11223
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bbf38aa898454a2bb9a4ac993eb2696fbd5f4e57;p=openembedded-core.git

insane.bbclass: maybe no log.do_compile or log.do_install

The insane.bbclass grep in log.do_compile and log.do_install
unconditionally, but there maybe no such logs when mirror the pkg from
sstate cache file. We should check whether the log file exists or not
before grep in it.

Additionally, break the one too long line into two (Add a "\n").

[YOCTO #2153]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6298136c39..fbeb97adce 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -612,19 +612,20 @@ python do_package_qa () {
     # Check the compile log for host contamination
     compilelog = os.path.join(logdir,"log.do_compile")
 
-    statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % compilelog
-    if os.system(statement) == 0:
-        bb.warn("%s: The compile log indicates that host include and/or library paths were used.  Please check the log '%s' for more information." % \
-                (pkg, compilelog))
-
+    if os.path.exists(compilelog):
+        statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % compilelog
+        if os.system(statement) == 0:
+            bb.warn("%s: The compile log indicates that host include and/or library paths were used.\n \
+        Please check the log '%s' for more information." % (pkg, compilelog))
 
     # Check the install log for host contamination
     installlog = os.path.join(logdir,"log.do_install")
 
-    statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % installlog
-    if os.system(statement) == 0:
-        bb.warn("%s: The install log indicates that host include and/or library paths were used.  Please check the log '%s' for more information." % \
-                (pkg, installlog))
+    if os.path.exists(installlog):
+        statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % installlog
+        if os.system(statement) == 0:
+            bb.warn("%s: The install log indicates that host include and/or library paths were used.\n \
+        Please check the log '%s' for more information." % (pkg, installlog))
 
     # Scan the packages...
     pkgdest = d.getVar('PKGDEST', True)