summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-05-13 18:56:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:12 +0100
commit659ed8718bbc23a1b3945a09833ebf7f9e67c52c (patch)
tree91bcc5e2dd78044fad0fb97da1fce49dcf02c079 /scripts/combo-layer
parentf969ce9ddf0c2bd08ee8dd92637697e27a67edb7 (diff)
downloadpoky-659ed8718bbc23a1b3945a09833ebf7f9e67c52c.tar.gz
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>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer3
1 files changed, 1 insertions, 2 deletions
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):
641 history = None 641 history = None
642 for name in repos: 642 for name in repos:
643 repo = conf.repos[name] 643 repo = conf.repos[name]
644 repo_history = repo.get('history', True) 644 repo_history = repo.get('history', False)
645 logger.error('%s: %s' % (name, repo_history))
646 if history is None: 645 if history is None:
647 history = repo_history 646 history = repo_history
648 elif history != repo_history: 647 elif history != repo_history: