sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

wic: use find_executable in favor of bb.utils.which 

As bitbake is not ported to Python 3 yet it's better to
avoid using its APIs as much as possible to be able to
test wic under Python 3 at least partially.

Used distutils.spawn.find_executable API in favor of
bb.utils.which to get path of the command to run.

(From OE-Core rev: 9658956bf8a5da779e06f71941de9b3e89415cdc)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2016-05-04 16:06:23 +03:00 committed by Richard Purdie
parent b6b5b5e295
commit bc89dc4225
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/wic/utils/oe/misc.py
View File

@ -28,6 +28,7 @@
import os
from collections import defaultdict
from distutils import spawn
from wic import msger
from wic.utils import runner
@ -83,13 +84,6 @@ def exec_cmd(cmd_and_args, as_shell=False, catch=3):
return out
def cmd_in_path(cmd, path):
import scriptpath
scriptpath.add_bitbake_lib_path()
return bb.utils.which(path, cmd) != "" or False
def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""):
"""
Execute native command, catching stderr, stdout
@ -112,7 +106,7 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""):
msger.debug("exec_native_cmd: %s" % cmd_and_args)
# If the command isn't in the native sysroot say we failed.
if cmd_in_path(args[0], native_paths):
if spawn.find_executable(args[0], native_paths):
ret, out = _exec_cmd(native_cmd_and_args, True, catch)
else:
ret = 127