]> code.ossystems Code Review - openembedded-core.git/commitdiff
utils.bbclass: skip empty paths when handling FILESEXTRAPATHS
authorMartin Jansa <Martin.Jansa@gmail.com>
Fri, 19 Aug 2011 12:16:28 +0000 (14:16 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 24 Aug 2011 01:23:17 +0000 (18:23 -0700)
* if there is multiple .bbappend files with FILESEXTRAPATHS_prepend := "/:"
  then the one parsed last is causing trailing ':' and that's causing empty element in
  path = extrapaths.split(:) + path
* it's hard to keep all .bbappends from foreign layers to follow this rule, so it's better
  to be able to handle trailing ':'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
meta/classes/utils.bbclass

index 56abdd844c08f7b50026cad831cde84dd8b12a59..3c2e342f91cbc958b8418f514b41c7cb58331d77 100644 (file)
@@ -338,8 +338,9 @@ def base_set_filespath(path, d):
        # The ":" ensures we have an 'empty' override
        overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
        for p in path:
-               for o in overrides.split(":"):
-                       filespath.append(os.path.join(p, o))
+               if p != "": 
+                       for o in overrides.split(":"):
+                               filespath.append(os.path.join(p, o))
        return ":".join(filespath)
 
 def extend_variants(d, var, extend, delim=':'):