From 7883bd2647b5fd683b931e85dd1366f13e08ccf0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 1 Feb 2019 15:50:02 +0100 Subject: [PATCH] hpcups-update-ppds can freeze sometimes, add timeout for to be sure --- hplip.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index f06122d..2681b82 100644 --- a/hplip.spec +++ b/hplip.spec @@ -86,6 +86,10 @@ Requires: python3-dbus Requires: %{_bindir}/gpg # /usr/lib/udev/rules.d Requires: systemd +# require coreutils, because timeout binary is needed in post scriptlet, +# because hpcups-update-ppds script can freeze in certain situation and +# stop the update +Requires(post): coreutils # gcc and gcc-c++ are no longer in buildroot by default @@ -452,7 +456,8 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %{_bindir}/systemctl enable cups &>/dev/null ||: %post -%{_bindir}/hpcups-update-ppds &>/dev/null ||: +# timeout is to prevent possible freeze during update +%{_bindir}/timeout 10m -k 15m %{_bindir}/hpcups-update-ppds &>/dev/null ||: %ldconfig_scriptlets libs @@ -599,6 +604,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %changelog * Fri Feb 01 2019 Zdenek Dohnal - 3.18.12-3 - m277-m281 printer support got some fixes, so try to do not use our downstream patch +- hpcups-update-ppds can freeze sometimes, add timeout for to be sure * Fri Feb 01 2019 Fedora Release Engineering - 3.18.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild