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>
This commit is contained in:
parent
c3f630df52
commit
53b1fa2d3e
|
@ -193,12 +193,6 @@ def exec_func(func, d, dirs = None, pythonexception=False):
|
||||||
except:
|
except:
|
||||||
oldcwd = None
|
oldcwd = None
|
||||||
|
|
||||||
body = d.getVar(func, False)
|
|
||||||
if not body:
|
|
||||||
if body is None:
|
|
||||||
logger.warning("Function %s doesn't exist", func)
|
|
||||||
return
|
|
||||||
|
|
||||||
flags = d.getVarFlags(func)
|
flags = d.getVarFlags(func)
|
||||||
cleandirs = flags.get('cleandirs')
|
cleandirs = flags.get('cleandirs')
|
||||||
if cleandirs:
|
if cleandirs:
|
||||||
|
@ -217,6 +211,13 @@ def exec_func(func, d, dirs = None, pythonexception=False):
|
||||||
adir = dirs[-1]
|
adir = dirs[-1]
|
||||||
else:
|
else:
|
||||||
adir = None
|
adir = None
|
||||||
|
|
||||||
|
body = d.getVar(func, False)
|
||||||
|
if not body:
|
||||||
|
if body is None:
|
||||||
|
logger.warning("Function %s doesn't exist", func)
|
||||||
|
return
|
||||||
|
|
||||||
ispython = flags.get('python')
|
ispython = flags.get('python')
|
||||||
|
|
||||||
lockflag = flags.get('lockfiles')
|
lockflag = flags.get('lockfiles')
|
||||||
|
|
Loading…
Reference in New Issue