From 1a9e0997c8d8aa9bb3b72e2e9e5ceaea3f2aac0b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Sep 2020 11:21:48 +0100 Subject: bitbake: Revert "bitbake-layers: add signal hander to avoid exception" This reverts commit 4fca9a07f2d6b0544977112672b786982d7bb8f2. The default python handler is to ignore SIGPIPE errors yet by adding this line, we see: 2020-09-23 22:10:20,325 - oe-selftest - INFO - recipetool.RecipetoolTests.test_recipetool_appendfile_subdir (subunit.RemotedTestCase) 2020-09-23 22:10:20,325 - oe-selftest - INFO - ... FAIL 2020-09-23 22:10:20,325 - oe-selftest - INFO - 11: 30/44 227/415 (14.85s) (recipetool.RecipetoolTests.test_recipetool_appendfile_subdir) 2020-09-23 22:10:20,325 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last): File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 226, in test_recipetool_appendfile_subdir _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile']) File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 85, in _try_recipetool_appendfile return self._try_recipetool_appendcmd(cmd, testrecipe, expectedfiles, expectedlines) File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 49, in _try_recipetool_appendcmd bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir) File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/devtool.py", line 186, in _check_bbappend result = runCmd('bitbake-layers show-appends', cwd=self.builddir) File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/commands.py", line 201, in runCmd raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output)) AssertionError: Command 'bitbake-layers show-appends' returned non-zero exit status 141: NOTE: Reconnecting to bitbake server... where status 141 is SIGPIPE. We expect SIGPIPE not to be raised like this. I tried the commands in the original commit to pipe through less with the change reverted and I don't see the error shown. I therefore believe this is safe to revert. (Bitbake rev: 94a18f1f2e51dd5d3928e6e0c17f2c19c8b5db49) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 2 -- 1 file changed, 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 149f1b1ac8..ff085d6744 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -14,7 +14,6 @@ import logging import os import sys import argparse -import signal bindir = os.path.dirname(__file__) topdir = os.path.dirname(bindir) @@ -26,7 +25,6 @@ import bb.msg logger = bb.msg.logger_create('bitbake-layers', sys.stdout) def main(): - signal.signal(signal.SIGPIPE, signal.SIG_DFL) parser = argparse.ArgumentParser( description="BitBake layers utility", epilog="Use %(prog)s --help to get help on a specific command", -- cgit v1.2.3-54-g00ecf