[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6840/8267] devtool: Setup logging before calling prepare

[Emmanuele Bassi <ebassi src gnome org>]

commit 821cb0b819832feaebe656ed34e9236dedf6d673
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Jul 19 15:18:44 2017 +0100

    devtool: Setup logging before calling prepare
    
    This avoids test failures like:
    
    INFO - ======================================================================
    INFO - FAIL [1.755s]: test_devtool_layer_plugins (devtool.DevtoolTests)
    INFO - ----------------------------------------------------------------------
    INFO - Traceback (most recent call last):
      File "/media/build1/poky/meta/lib/oeqa/core/decorator/__init__.py", line 32, in wrapped_f
        return func(*args, **kwargs)
      File "/media/build1/poky/meta/lib/oeqa/selftest/cases/devtool.py", line 1354, in 
test_devtool_layer_plugins
        self.assertEqual(result.output, s[::-1])
    AssertionError: "NOTE: Starting bitbake server...\noY senu[36 chars]rciM" != "oY senuZ s'enoynA morF 
tiforP oN edaM tfosorciM"
    - NOTE: Starting bitbake server...
      oY senuZ s'enoynA morF tiforP oN edaM tfosorciM
    INFO - ----------------------------------------------------------------------
    
    since there is corruption in the output. Setting the logging up before
    calling tinfoil.prepare() resolves this.
    
    (From OE-Core rev: 3c479fb17ae4d3e7e5f0889af0f68257ef66475c)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index bba0721..b231e46 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -115,8 +115,8 @@ def setup_tinfoil(config_only=False, basepath=None, tracking=False):
         import bb.tinfoil
         tinfoil = bb.tinfoil.Tinfoil(tracking=tracking)
         try:
-            tinfoil.prepare(config_only)
             tinfoil.logger.setLevel(logger.getEffectiveLevel())
+            tinfoil.prepare(config_only)
         except bb.tinfoil.TinfoilUIException:
             tinfoil.shutdown()
             raise DevtoolError('Failed to start bitbake environment')