[oe-commits] [openembedded-core] 17/17: staging: Fix do_fetch dependency correction

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 03ccf453f675a65ad205541e06606e7e9f8647a4
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Apr 11 00:20:01 2017 +0100

    staging: Fix do_fetch dependency correction
    
    This should only be applied if do_fetch has populate_sysroot dependencies.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/staging.bbclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index c50abd0..c1a0ed8 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -647,11 +647,11 @@ python staging_taskhandler() {
         deps = d.getVarFlag(task, "depends")
         if deps and "populate_sysroot" in deps:
             d.appendVarFlag(task, "prefuncs", " extend_recipe_sysroot")
-        # If this is do_fetch, we need to move the cleandirs above to the extend_recipe_sysroot task
-        # else we'd wipe out the sysroot we just created.
-        if task == "do_fetch":
-            d.setVarFlag("extend_recipe_sysroot", "cleandirs", d.getVarFlag(task, "cleandirs"))
-            d.delVarFlag(task, "cleandirs")
+            # If this is do_fetch, we need to move the cleandirs above to the extend_recipe_sysroot task
+            # else we'd wipe out the sysroot we just created.
+            if task == "do_fetch":
+                d.setVarFlag("extend_recipe_sysroot", "cleandirs", d.getVarFlag(task, "cleandirs"))
+                d.delVarFlag(task, "cleandirs")
 }
 staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess"
 addhandler staging_taskhandler

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.