From 659ed8718bbc23a1b3945a09833ebf7f9e67c52c Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 13 May 2016 18:56:56 +0200 Subject: 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 Signed-off-by: Richard Purdie --- scripts/combo-layer | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index 92525cac14..a0a737d6ee 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -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: -- cgit v1.2.3-54-g00ecf