diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2017-04-05 11:57:59 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2017-04-05 11:57:59 +0000 |
| commit | 08aa78a595fe571d248000829d8ac7675607f5a9 (patch) | |
| tree | e5c77c103d2d8c57673648b59d58d459a16cc265 /usr.sbin | |
| parent | 39608fe1df53bd82c4a8244fa05f012b21bb840a (diff) | |
For a non-interactive attempt to pkg_delete a firmware package, print a
message advising use of "fw_update -d" rather than saying "ok" and doing
nothing. (pkg_delete intentionally makes it hard to uninstall firmware
to prevent surprises when cleaning a machine).
aja and I were surprised by the "ok" leaving the fw package installed.
suggestion from espie to mention fw_update -d in the message.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 94faf84a713..9a5bcd7eba7 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.148 2017/03/25 18:58:59 espie Exp $ +# $OpenBSD: Delete.pm,v 1.149 2017/04/05 11:57:58 sthen Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -100,6 +100,7 @@ sub delete_package return; } } else { + $state->errsay("NOT deleting #1: use fwupdate -d", $pkgname); return; } } |