diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-03-25 08:58:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-06 15:46:03 +0100 |
commit | 2d73cd1d32171e8374a1fd77f5988b2fcba46d57 (patch) | |
tree | 2e6f7da472d7504ed6dd12fe35369000037899cb /bitbake/lib | |
parent | 8b938dc82cf196090c631eef63bf14d32eef9852 (diff) | |
download | ast2050-yocto-poky-2d73cd1d32171e8374a1fd77f5988b2fcba46d57.zip ast2050-yocto-poky-2d73cd1d32171e8374a1fd77f5988b2fcba46d57.tar.gz |
build: fix dir removal traceback
This one is to cover the case where the current directory vanishes out from
under us, so os.getcwd() raises an OSError.
(Bitbake rev: 7a29ab534388c0095f7f826b16c5cff343927d10)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/build.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index bbf3ae1..80bb887 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -182,16 +182,16 @@ def exec_func_python(func, d, runfile, cwd=None): """Execute a python BB 'function'""" bbfile = d.getVar('FILE', True) - try: - olddir = os.getcwd() - except OSError: - olddir = None code = _functionfmt.format(function=func, body=d.getVar(func, True)) bb.utils.mkdirhier(os.path.dirname(runfile)) with open(runfile, 'w') as script: script.write(code) if cwd: + try: + olddir = os.getcwd() + except OSError: + olddir = None os.chdir(cwd) try: @@ -203,8 +203,11 @@ def exec_func_python(func, d, runfile, cwd=None): raise FuncFailed(func, None) finally: - if olddir: - os.chdir(olddir) + if cwd and olddir: + try: + os.chdir(olddir) + except OSError: + pass def exec_func_shell(function, d, runfile, cwd=None): """Execute a shell function from the metadata |