summaryrefslogtreecommitdiff
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 07:26:41 +0100
commitd0304acb05b926b08805d8652e12eaf19bf53ad6 (patch)
tree287fd2ef395a87f46d2ec02c7220c4789f450aab /scripts/combo-layer
parenta63798df712bf0d2362e07713c06af3b071a10b2 (diff)
downloadopenembedded-core-d0304acb05b926b08805d8652e12eaf19bf53ad6.tar.gz
openembedded-core-d0304acb05b926b08805d8652e12eaf19bf53ad6.tar.bz2
openembedded-core-d0304acb05b926b08805d8652e12eaf19bf53ad6.zip
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>
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):
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: