summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:29:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-15 12:15:07 +0100
commit53b1fa2d3e1244c46a705d9a40ca0dbee92eab98 (patch)
treee210aaf868d1d8b57bced27487a4a002590524a3 /bitbake
parentc3f630df52c3a278316fba89c92f90b5426c36d8 (diff)
downloadpoky-53b1fa2d3e1244c46a705d9a40ca0dbee92eab98.tar.gz
bitbake: build: Allow dirs/cleandirs to work for empty functions
Users are surprised when dirs/cleandirs aren't acted upon for empty functions. This reorders the code slightly so that those flags are acted upon for empty functions as there are cases where this is expected. [YOCTO #10256] (Bitbake rev: 5bf874673d75b5f4ff2b34f0ab8502558ee84d00) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/build.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 310b5c0511..fcf0149178 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -193,12 +193,6 @@ def exec_func(func, d, dirs = None, pythonexception=False):
193 except: 193 except:
194 oldcwd = None 194 oldcwd = None
195 195
196 body = d.getVar(func, False)
197 if not body:
198 if body is None:
199 logger.warning("Function %s doesn't exist", func)
200 return
201
202 flags = d.getVarFlags(func) 196 flags = d.getVarFlags(func)
203 cleandirs = flags.get('cleandirs') 197 cleandirs = flags.get('cleandirs')
204 if cleandirs: 198 if cleandirs:
@@ -217,6 +211,13 @@ def exec_func(func, d, dirs = None, pythonexception=False):
217 adir = dirs[-1] 211 adir = dirs[-1]
218 else: 212 else:
219 adir = None 213 adir = None
214
215 body = d.getVar(func, False)
216 if not body:
217 if body is None:
218 logger.warning("Function %s doesn't exist", func)
219 return
220
220 ispython = flags.get('python') 221 ispython = flags.get('python')
221 222
222 lockflag = flags.get('lockfiles') 223 lockflag = flags.get('lockfiles')