[gnome-continuous-yocto/gnomeostree-3.28-rocko: 280/8267] combo-layer: fix default "update" mode

[Emmanuele Bassi <ebassi src gnome org>]

commit 659ed8718bbc23a1b3945a09833ebf7f9e67c52c
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri May 13 18:56:56 2016 +0200

    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>

 scripts/combo-layer |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 92525ca..a0a737d 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: