[PATCH] build: Allow dirs/cleandirs to work for empty functions

[PATCH] build: Allow dirs/cleandirs to work for empty functions

[Richard Purdie]

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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 9dfcfec..5759502 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):
     except:
         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)
     cleandirs = flags.get('cleandirs')
     if cleandirs:
@@ -217,6 +211,13 @@ def exec_func(func, d, dirs = None, pythonexception=False):
         adir = dirs[-1]
     else:
         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')
 
     lockflag = flags.get('lockfiles')

Re: [PATCH] build: Allow dirs/cleandirs to work for empty functions

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

On Wed, Sep 14, 2016 at 2:29 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> 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]
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>

Looks good.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1113 bytes --]