combo-layer: fix default "update" mode

When the "history" option is not set in the combo-layer.conf, the
intended default was to use the traditional method. Passing "True" as
default when querying the config was unintentional.

Also remove some left-over debugging code.

(From OE-Core rev: d0304acb05b926b08805d8652e12eaf19bf53ad6)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2016-05-13 18:56:56 +02:00 committed by Richard Purdie
parent f969ce9ddf
commit 659ed8718b
1 changed files with 1 additions and 2 deletions

View File

@ -641,8 +641,7 @@ def action_update(conf, args):
history = None
for name in repos:
repo = conf.repos[name]
repo_history = repo.get('history', True)
logger.error('%s: %s' % (name, repo_history))
repo_history = repo.get('history', False)
if history is None:
history = repo_history
elif history != repo_history: