[oe-commits] Tobias Henkel : icecc: Use bb.utils.which instead of calling which

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 7ed7aa38182ce8c7300a08e3aefcc65da2b524a8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7ed7aa38182ce8c7300a08e3aefcc65da2b524a8

Author: Tobias Henkel <tobias.henkel at bmw-carit.de>
Date:   Fri Nov 15 08:36:41 2013 +0100

icecc: Use bb.utils.which instead of calling which

The icecc class often calls 'which' for determining paths. This leads
to many messages on stderr in case 'which' doesn't find the
executable. Using bb.utils.which is more appropriate here and doesn't
pollute stderr.

Signed-off-by: Tobias Henkel <tobias.henkel at bmw-carit.de>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/icecc.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 1f53f85..49dbd77 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -55,7 +55,7 @@ def get_cross_kernel_cc(bb,d):
     return kernel_cc
 
 def get_icecc(d):
-    return d.getVar('ICECC_PATH') or os.popen("which icecc").read()[:-1]
+    return d.getVar('ICECC_PATH') or bb.utils.which(os.getenv("PATH"), "icecc")
 
 def create_path(compilers, bb, d):
     """
@@ -175,9 +175,9 @@ def icc_get_external_tool(bb, d, tool):
 
 def icc_get_tool(bb, d, tool):
     if icc_is_native(bb, d):
-        return os.popen("which %s" % tool).read()[:-1]
+        return bb.utils.which(os.getenv("PATH"), tool)
     elif icc_is_kernel(bb, d):
-        return os.popen("which %s" % get_cross_kernel_cc(bb, d)).read()[:-1]
+        return bb.utils.which(os.getenv("PATH"), get_cross_kernel_cc(bb, d))
     else:
         ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}')
         target_sys = d.expand('${TARGET_SYS}')