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.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 92525cac14aba9ccb55bfaca80500f8da3182fcf..a0a737d6eea7c4b40ce6c764558931c727e1d0b3 100755 (executable)
--- 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: