summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-19 15:24:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-21 08:44:25 +0100
commitac4682fc9cc3b7dd0f3f0201f5710e62890cd9c0 (patch)
tree69208b55af3a00715421abb523c0de0b154d0b32
parent0d72748e81186d38511cd691521cbd9fa7336879 (diff)
downloadpoky-ac4682fc9cc3b7dd0f3f0201f5710e62890cd9c0.tar.gz
oe-pkgdata-util: Setup logging before calling prepare
This avoids test failures like: INFO - ====================================================================== INFO - FAIL [1.046s]: test_find_path (pkgdata.OePkgdataUtilTests) 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/pkgdata.py", line 50, in test_find_path self.assertEqual(result.output, 'zlib: /lib/libz.so.1') AssertionError: 'NOTE: Starting bitbake server...\nzlib: /lib/libz.so.1' != 'zlib: /lib/libz.so.1' - NOTE: Starting bitbake server... zlib: /lib/libz.so.1 INFO - ---------------------------------------------------------------------- since there is corruption in the output. Setting the logging up before calling tinfoil.prepare() resolves this. (From OE-Core rev: 39c1bf1feccc8dca57160a1e3cd8a50e8c30ef02) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-pkgdata-util3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 677effeef6..a690870b1c 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -40,9 +40,8 @@ def tinfoil_init():
40 import bb.tinfoil 40 import bb.tinfoil
41 import logging 41 import logging
42 tinfoil = bb.tinfoil.Tinfoil() 42 tinfoil = bb.tinfoil.Tinfoil()
43 tinfoil.prepare(True)
44
45 tinfoil.logger.setLevel(logging.WARNING) 43 tinfoil.logger.setLevel(logging.WARNING)
44 tinfoil.prepare(True)
46 return tinfoil 45 return tinfoil
47 46
48 47