On Mon, 2016-09-26 at 13:53 -0700, Juro Bystricky wrote:
> When trying to obtain the current directory from a directory
> that does not exist anymore, an exception is raised.
> This patch handles such exception.
This should have gone to bitbake-devel, I've cc'd there and queued in
master-next for testing.
Cheers,
Richard
> [YOCTO #10331]
>
> Signed-off-by: Juro Bystricky <juro.bystri...@intel.com>
> ---
> bitbake/lib/bb/build.py | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> index 2ed0441..249f7d6 100644
> --- a/bitbake/lib/bb/build.py
> +++ b/bitbake/lib/bb/build.py
> @@ -261,9 +261,14 @@ def exec_func(func, d, dirs = None,
> pythonexception=False):
> else:
> exec_func_shell(func, d, runfile, cwd=adir)
>
> - if oldcwd and os.getcwd() != oldcwd:
> + try:
> + curcwd = os.getcwd()
> + except:
> + curcwd = None
> +
> + if oldcwd and curcwd != oldcwd:
> try:
> - bb.warn("Task %s changed cwd to %s" % (func,
> os.getcwd()))
> + bb.warn("Task %s changed cwd to %s" % (func, curcwd))
> os.chdir(oldcwd)
> except:
> pass
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
