From c6f439f75a0c611934ed42a09d2820f7d8e1135d Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 12 Jul 2014 22:08:23 +0000 Subject: [PATCH] don't check_security on newer *after* making sure the set doesn't have errors. Note that the errors are already signaling enough (conflicts, bad package etc)... And not having any errors mean we actually have proper plists. problem noticed by zhuk@ --- usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index 7cac6d8a918..27cb639d4c2 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.71 2014/07/12 19:58:20 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.72 2014/07/12 22:08:23 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -964,14 +964,14 @@ sub process_set return $set; } - for my $h ($set->newer) { - $set->check_security($state, $h->plist, $h); - } - if (newer_has_errors($set, $state)) { return (); } + for my $h ($set->newer) { + $set->check_security($state, $h->plist, $h); + } + if (newer_is_bad_arch($set, $state)) { return (); } -- 2.20.1