summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2018-06-30 08:28:37 +0000
committerMarc Espie <espie@cvs.openbsd.org>2018-06-30 08:28:37 +0000
commite56bbc05ac903af673abb6cef983d8d3f1086442 (patch)
tree5289ad908571070c9a832f0a131906ef51c2ba94 /usr.sbin
parent10735568f16a731c5c4e9241bacc4190b0a40e58 (diff)
over-eager refactor means fw_update goes thru delete_handle, so teach
it about firmwares. problem noticed by aja@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Delete.pm4
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)) {