Skip to contentSkip to conversation

tinfoil overrides fix

PATCH New Paul Eggleton 1 participant 2 messages Apr 20, 2017

lore
Share & tools
lore
#0 lore raw

cover tinfoil overrides fix

The following changes since commit b4da94a368c6c44c6e5b6e6e9a1e041ed84b4554:

bitbake: Update version to 1.34.0 for stable release (2017-04-19 10:42:07 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/tinfoil-overrides2-bb
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/tinfoil-overrides2-bb

Paul Eggleton (1):
lib/bb/command: fix overrides in remote datastores where there is no default

 lib/bb/command.py | 3 +++
 1 file changed, 3 insertions(+)
Signature · 1 line
2.9.3
#1 lore raw

PATCH 1/1 lib/bb/command: fix overrides in remote datastores where there is no default

If you have, for example, no value set for a variable VARIABLE and a then VARIABLE_pn-something = "value" and then you parse something.bb, you expect getVar('VARIABLE') on the resulting datastore to return "value", but the code here assumed that if the variable wasn't set without overrides then we didn't need to return the overridedata and thus we didn't get the overridden value.

In OE this affected the ability to get RECIPE_MAINTAINER for a recipe in a script using tinfoil (since this is only set from an inc file with _pn- overrides for each recipe, and no default is set).

---
 lib/bb/command.py | 3 +++
 1 file changed, 3 insertions(+)
lib/bb/command.py +3 -0
index 390d4f1..ab51d8e 100644
@@ -479,6 +479,9 @@ class CommandsSync:
                         '_connector_overrides': overridedata}
             else:
                 value['_connector_overrides'] = overridedata
+        else:
+            value = {}
+            value['_connector_overrides'] = overridedata
         return value
     dataStoreConnectorFindVar.readonly = True
 
Signature · 1 line
2.9.3