From 2d73cd1d32171e8374a1fd77f5988b2fcba46d57 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 25 Mar 2011 08:58:52 -0700 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/build.py') diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index bbf3ae1729..80bb887383 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 -- cgit v1.2.3-54-g00ecf