From 69677d045ac4af8630cd826288642b4657376f76 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 6 Jun 2022 08:03:32 +0000 Subject: [PATCH] zap fairly old bug from refactoring: we already validated all the set plists, don't do it again (would skew the file system usage a bit). Also: we don't need to check for firmware if we're not actively deleting. normal updates won't touch them. --- usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index 9909ed23caa..ee0d7375f87 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.136 2022/06/06 07:39:39 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.137 2022/06/06 08:03:32 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -768,7 +768,7 @@ sub delete_old_packages $state->set_name_from_handle($o, '-'); require OpenBSD::Delete; try { - OpenBSD::Delete::delete_handle($o, $state); + OpenBSD::Delete::delete_plist($o->plist, $state); } catch { $state->errsay($_); $state->fatal(partial_install( -- 2.20.1