diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/build.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 2ed0441b49..249f7d6bb4 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): | |||
261 | else: | 261 | else: |
262 | exec_func_shell(func, d, runfile, cwd=adir) | 262 | exec_func_shell(func, d, runfile, cwd=adir) |
263 | 263 | ||
264 | if oldcwd and os.getcwd() != oldcwd: | 264 | try: |
265 | curcwd = os.getcwd() | ||
266 | except: | ||
267 | curcwd = None | ||
268 | |||
269 | if oldcwd and curcwd != oldcwd: | ||
265 | try: | 270 | try: |
266 | bb.warn("Task %s changed cwd to %s" % (func, os.getcwd())) | 271 | bb.warn("Task %s changed cwd to %s" % (func, curcwd)) |
267 | os.chdir(oldcwd) | 272 | os.chdir(oldcwd) |
268 | except: | 273 | except: |
269 | pass | 274 | pass |