diff options
Diffstat (limited to 'bitbake/lib/bb/command.py')
-rw-r--r-- | bitbake/lib/bb/command.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index db20f3ffad..222a76e580 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py | |||
@@ -457,16 +457,22 @@ class CommandsSync: | |||
457 | dsindex = params[0] | 457 | dsindex = params[0] |
458 | name = params[1] | 458 | name = params[1] |
459 | datastore = command.remotedatastores[dsindex] | 459 | datastore = command.remotedatastores[dsindex] |
460 | value = datastore._findVar(name) | 460 | value, overridedata = datastore._findVar(name) |
461 | 461 | ||
462 | if value: | 462 | if value: |
463 | content = value.get('_content', None) | 463 | content = value.get('_content', None) |
464 | if isinstance(content, bb.data_smart.DataSmart): | 464 | if isinstance(content, bb.data_smart.DataSmart): |
465 | # Value is a datastore (e.g. BB_ORIGENV) - need to handle this carefully | 465 | # Value is a datastore (e.g. BB_ORIGENV) - need to handle this carefully |
466 | idx = command.remotedatastores.check_store(content, True) | 466 | idx = command.remotedatastores.check_store(content, True) |
467 | return {'_content': DataStoreConnectionHandle(idx), '_connector_origtype': 'DataStoreConnectionHandle'} | 467 | return {'_content': DataStoreConnectionHandle(idx), |
468 | '_connector_origtype': 'DataStoreConnectionHandle', | ||
469 | '_connector_overrides': overridedata} | ||
468 | elif isinstance(content, set): | 470 | elif isinstance(content, set): |
469 | return {'_content': list(content), '_connector_origtype': 'set'} | 471 | return {'_content': list(content), |
472 | '_connector_origtype': 'set', | ||
473 | '_connector_overrides': overridedata} | ||
474 | else: | ||
475 | value['_connector_overrides'] = overridedata | ||
470 | return value | 476 | return value |
471 | dataStoreConnectorFindVar.readonly = True | 477 | dataStoreConnectorFindVar.readonly = True |
472 | 478 | ||