diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-04-20 14:20:29 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-20 07:59:40 +0100 |
commit | d45f5be97741909bd9024e80ac385591d3872d0c (patch) | |
tree | 9043519874d35d6f717d06a1e57e881e79f40431 /bitbake/lib/bb | |
parent | 7bde854ef77a683e92941fb6fc2f6592f5d3c29a (diff) | |
download | poky-d45f5be97741909bd9024e80ac385591d3872d0c.tar.gz |
bitbake: 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).
(Bitbake rev: b3d2c9917c5fd8278878328794daa107ddf79b64)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/command.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index 390d4f1de3..ab51d8e6cd 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py | |||
@@ -479,6 +479,9 @@ class CommandsSync: | |||
479 | '_connector_overrides': overridedata} | 479 | '_connector_overrides': overridedata} |
480 | else: | 480 | else: |
481 | value['_connector_overrides'] = overridedata | 481 | value['_connector_overrides'] = overridedata |
482 | else: | ||
483 | value = {} | ||
484 | value['_connector_overrides'] = overridedata | ||
482 | return value | 485 | return value |
483 | dataStoreConnectorFindVar.readonly = True | 486 | dataStoreConnectorFindVar.readonly = True |
484 | 487 | ||