From 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Fri, 12 Oct 2018 19:16:53 -0700 Subject: handle EINTR while polling scripts/hooks If poll() is interrupted by a signal, alpm was closing the socket it uses for listening to script/hook output. This would drop script output at the least and kill the script at the worst. Fixes FS#60396 Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae (cherry picked from commit ac959bb9c6ce549047a954109ae825158855e386) --- test/pacman/tests/TESTS | 1 + test/pacman/tests/scriptlet-signal-handling.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 test/pacman/tests/scriptlet-signal-handling.py (limited to 'test') diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fec4bc2f..86126f18 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/replace102.py TESTS += test/pacman/tests/replace103.py TESTS += test/pacman/tests/replace104.py TESTS += test/pacman/tests/replace110.py +TESTS += test/pacman/tests/scriptlet-signal-handling.py TESTS += test/pacman/tests/scriptlet-signal-reset.py TESTS += test/pacman/tests/scriptlet001.py TESTS += test/pacman/tests/scriptlet002.py diff --git a/test/pacman/tests/scriptlet-signal-handling.py b/test/pacman/tests/scriptlet-signal-handling.py new file mode 100644 index 00000000..e65df55b --- /dev/null +++ b/test/pacman/tests/scriptlet-signal-handling.py @@ -0,0 +1,15 @@ +self.description = "Handle signal interrupts while running scriptlets/hooks" + +p1 = pmpkg("dummy") +p1.install['post_install'] = """ + kill -INT $PPID # send an arbitrary signal that pacman catches + sleep 1 # give alpm time to close the socket if EINTR was not handled + echo to-parent # if the interrupt is not handled this will die with SIGPIPE + echo success > interrupt_was_handled + """ +self.addpkg(p1) + +self.args = "-U %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_EXIST=interrupt_was_handled") -- cgit v1.2.3-24-g4f1b