[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5719/8267] bitbake: lib/bb/command: fix overrides in remote datastores where there is no default



commit d45f5be97741909bd9024e80ac385591d3872d0c
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Apr 20 14:20:29 2017 +1200

    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>

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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]