diff options
| author |   Juro Bystricky <juro.bystricky@intel.com> | 2016-09-26 13:53:13 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-27 13:24:55 +0100 |
| commit | 4bcf77589312d9936340d8c308006c2fc9baf67c (patch) | |
| tree | 15d85d35f0234f49bd5b6e11f3d7366b768fcdfd | |
| parent | 326d18d96faf02675ba34ad3c3a20cd424b39b91 (diff) | |
| download | bitbake-4bcf77589312d9936340d8c308006c2fc9baf67c.tar.gz | |
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]
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/build.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/bb/build.py b/lib/bb/build.py index 2ed0441b4..249f7d6bb 100644 --- a/lib/bb/build.py +++ b/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 |