[bitbake-devel] [PATCH v2][1.32] fetch2: fix import error for Python 3.6.5

[Christopher Larson]

subprocess searches PATH by default, /usr/bin/env is redundant anywhere but
in a #! line of an executable script, as far as I know.

On Wed, Jul 25, 2018 at 5:27 PM Changhyeok Bae <changhyeok.bae at gmail.com>
wrote:

> From: Tzu Hsiang Lin <t9360341 at ntut.org.tw>
>
> When running bitbake command with Python 3.6.5 always result in
> import error causing by the change of distutils module.
> This patch replaces the method to search executable in PATH by
> "/usr/bin/env <command>".
>
> Signed-off-by: Tzu Hsiang Lin <t9360341 at ntut.org.tw>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> Signed-off-by: Changhyeok Bae <changhyeok.bae at gmail.com>
> ---
>  lib/bb/fetch2/clearcase.py | 3 +--
>  lib/bb/fetch2/npm.py       | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/lib/bb/fetch2/clearcase.py b/lib/bb/fetch2/clearcase.py
> index 70e280a..41cd46f 100644
> --- a/lib/bb/fetch2/clearcase.py
> +++ b/lib/bb/fetch2/clearcase.py
> @@ -70,7 +70,6 @@ from   bb.fetch2 import FetchMethod
>  from   bb.fetch2 import FetchError
>  from   bb.fetch2 import runfetchcmd
>  from   bb.fetch2 import logger
> -from   distutils import spawn
>
>  class ClearCase(FetchMethod):
>      """Class to fetch urls via 'clearcase'"""
> @@ -108,7 +107,7 @@ class ClearCase(FetchMethod):
>          else:
>              ud.module = ""
>
> -        ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or
> spawn.find_executable("cleartool") or spawn.find_executable("rcleartool")
> +        ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or "/usr/bin/env
> cleartool || rcleartool"
>
>          if data.getVar("SRCREV", d, True) == "INVALID":
>            raise FetchError("Set a valid SRCREV for the clearcase fetcher
> in your recipe, e.g. SRCREV = \"/main/LATEST\" or any other label of your
> choice.")
> diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py
> index 699ae72..7ccaba9 100644
> --- a/lib/bb/fetch2/npm.py
> +++ b/lib/bb/fetch2/npm.py
> @@ -33,7 +33,6 @@ from   bb.fetch2 import runfetchcmd
>  from   bb.fetch2 import logger
>  from   bb.fetch2 import UnpackError
>  from   bb.fetch2 import ParameterError
> -from   distutils import spawn
>
>  def subprocess_setup():
>      # Python installs a SIGPIPE handler by default. This is usually not
> what
> --
> 2.7.4
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>


-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/bitbake-devel/attachments/20180725/2ea10b15/attachment-0002.html>