[oe-commits] [bitbake] 01/02: lib/bb/command: fix overrides in remote datastores where there is no default

git at git.openembedded.org git at git.openembedded.org
Thu Apr 20 07:00:10 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.34
in repository bitbake.

commit b3d2c9917c5fd8278878328794daa107ddf79b64
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Apr 20 14:20:29 2017 +1200

    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).
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/command.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/bb/command.py b/lib/bb/command.py
index 390d4f1..ab51d8e 100644
--- a/lib/bb/command.py
+++ b/lib/bb/command.py
@@ -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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list