rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

hpcups-update-ppds can freeze sometimes, add timeout for to be sure

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-02-01 15:50:02 +01:00
parent 207014e3ad
commit 7883bd2647
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hplip.spec
View File

@ -86,6 +86,10 @@ Requires: python3-dbus
Requires: %{_bindir}/gpg Requires: %{_bindir}/gpg
# /usr/lib/udev/rules.d # /usr/lib/udev/rules.d
Requires: systemd 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 # 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 ||: %{_bindir}/systemctl enable cups &>/dev/null ||:
%post %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 %ldconfig_scriptlets libs
@ -599,6 +604,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%changelog %changelog
* Fri Feb 01 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-3 * Fri Feb 01 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-3
- m277-m281 printer support got some fixes, so try to do not use our downstream patch - 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 <releng@fedoraproject.org> - 3.18.12-2 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild