From 6b6a24c484750b70f5f5a3ccb394a1f1ded0e687 Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 7 Oct 2023 09:11:26 +0000 Subject: [PATCH] with firmware known, recognize that we couldn't find any update at all and just say that instead of a dauntingly long list of packages --- usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index 23e952640bc..ad97455ef2a 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.143 2023/07/03 19:12:08 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.144 2023/10/07 09:11:26 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -1112,6 +1112,16 @@ sub grab_debug_package($class, $d, $dbg, $state) } } +sub report_cantupdate($state, $cantupdate) +{ + if ($state->tracker->did_something) { + $state->say("Couldn't find updates for #1", + join(' ', sort @$cantupdate)); + } else { + $state->say("Couldn't find any update"); + } +} + sub inform_user_of_problems($state) { my @cantupdate = $state->tracker->cant_list; @@ -1120,10 +1130,8 @@ sub inform_user_of_problems($state) sub($quirks) { $quirks->filter_obsolete(\@cantupdate, $state); }); - - $state->say("Couldn't find updates for #1", - join(' ', sort @cantupdate)) if @cantupdate > 0; if (@cantupdate > 0) { + report_cantupdate($state, \@cantupdate); $state->{bad}++; } } -- 2.20.1