bitbake: build.py: fix os.getcwd() exception
When trying to obtain the current directory from a directory that does not exist anymore, an exception is raised. This patch handles such exception. [YOCTO #10331] (Bitbake rev: 4bcf77589312d9936340d8c308006c2fc9baf67c) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
12905346a0
commit
8b24b0c359
|
@ -261,9 +261,14 @@ def exec_func(func, d, dirs = None, pythonexception=False):
|
||||||
else:
|
else:
|
||||||
exec_func_shell(func, d, runfile, cwd=adir)
|
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:
|
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)
|
os.chdir(oldcwd)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
Loading…
Reference in New Issue