diff options
| author |   espie <espie@openbsd.org> | 2018-06-30 08:28:36 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2018-06-30 08:28:36 +0000 |
| commit | dd248c46305c0c574891d7203af63e5f3993aeeb (patch) | |
| tree | 4540f3250d47bd50a2284427ff6ecfa114934834 | |
| parent | tweak previous; (diff) | |
| download | wireguard-openbsd-dd248c46305c0c574891d7203af63e5f3993aeeb.tar.xz wireguard-openbsd-dd248c46305c0c574891d7203af63e5f3993aeeb.zip | |
over-eager refactor means fw_update goes thru delete_handle, so teach
it about firmwares.
problem noticed by aja@
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index c7970beb926..1c554e5434d 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.155 2018/06/24 11:38:43 sthen Exp $ +# $OpenBSD: Delete.pm,v 1.156 2018/06/30 08:28:36 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -85,7 +85,7 @@ sub delete_handle my $pkgname = $handle->pkgname; $state->progress->message($state->f("reading list for #1", $pkgname)); my $plist = $handle->plist; - if ($plist->has('firmware')) { + if ($plist->has('firmware') && !$state->defines('FW_UPDATE')) { if ($state->is_interactive) { if (!$state->confirm_defaults_to_no( "\nDelete firmware #1", $pkgname)) { |