[oe-commits] Richard Purdie : Revert "utils.bbclass: Fix override ordering for FILESPATH"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dora
Commit: c303f5ecf7cda1c3b8bb776a6800946c0487cd93
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c303f5ecf7cda1c3b8bb776a6800946c0487cd93

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Dec  3 12:55:47 2013 +0000

Revert "utils.bbclass: Fix override ordering for FILESPATH"

This reverts commit 0bd63125c3b44a656e44f2a76cc5f832c9db4bbd.

As discussed on the mailing list, this change changes layer layout
in a stable branch which is unaccetable. The was accidentally
backported and should not have been, this reverts it.

---

 meta/classes/utils.bbclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 0a533af..d1f6563 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -307,11 +307,10 @@ def base_set_filespath(path, d):
     if extrapaths != "":
         path = extrapaths.split(":") + path
     # The ":" ensures we have an 'empty' override
-    overrides = (":" + (d.getVar("FILESOVERRIDES", True) or "")).split(":")
-    overrides.reverse()
-    for o in overrides:
-        for p in path:
-            if p != "": 
+    overrides = ((d.getVar("FILESOVERRIDES", True) or "") + ":").split(":")
+    for p in path:
+        if p != "": 
+            for o in overrides:
                 filespath.append(os.path.join(p, o))
     return ":".join(filespath)