summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-24 11:21:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-24 22:34:16 +0100
commit1a9e0997c8d8aa9bb3b72e2e9e5ceaea3f2aac0b (patch)
tree7caa6e8ab97def812f80528b88f006a2ceab0c18 /bitbake
parentbbca8ff5af3de72736aac442f49f2c4e2985dd02 (diff)
downloadpoky-1a9e0997c8d8aa9bb3b72e2e9e5ceaea3f2aac0b.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-layers2
1 files changed, 0 insertions, 2 deletions
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
14import os 14import os
15import sys 15import sys
16import argparse 16import argparse
17import signal
18 17
19bindir = os.path.dirname(__file__) 18bindir = os.path.dirname(__file__)
20topdir = os.path.dirname(bindir) 19topdir = os.path.dirname(bindir)
@@ -26,7 +25,6 @@ import bb.msg
26logger = bb.msg.logger_create('bitbake-layers', sys.stdout) 25logger = bb.msg.logger_create('bitbake-layers', sys.stdout)
27 26
28def main(): 27def main():
29 signal.signal(signal.SIGPIPE, signal.SIG_DFL)
30 parser = argparse.ArgumentParser( 28 parser = argparse.ArgumentParser(
31 description="BitBake layers utility", 29 description="BitBake layers utility",
32 epilog="Use %(prog)s <subcommand> --help to get help on a specific command", 30 epilog="Use %(prog)s <subcommand> --help to get help on a specific command",