SRC_URI_append_machine = foo

Was broken. update_data() was called before the OVERRIDES were completed.
Now we keep the additional information until a valid machine is there. They don't hurt anyway.

diff --git a/bin/oe/data.py b/bin/oe/data.py
index 98989b0..9d55bd3 100644 (file)
--- a/bin/oe/data.py
+++ b/bin/oe/data.py
@@ -409,19 +409,23 @@ def update_data(d = _data):
 
 #       Handle line appends:
         for (a, o) in getVarFlag(s, '_append', d) or []:
-            delVarFlag(s, '_append', d)
+            # maybe the OVERRIDE was not yet added so keep the append
+            if (o and o in overrides) or not o:
+                delVarFlag(s, '_append', d)
             if o:
                 if not o in overrides:
-                    break
+                    continue
             sval+=a
             setVar(s, sval, d)
 
 #       Handle line prepends
         for (a, o) in getVarFlag(s, '_prepend', d) or []:
-            delVarFlag(s, '_prepend', d)
+            # maybe the OVERRIDE was not yet added so keep the append
+            if (o and o in overrides) or not o:
+                delVarFlag(s, '_prepend', d)
             if o:
                 if not o in overrides:
-                    break
+                    continue
             sval=a+sval
             setVar(s, sval, d)