diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2014-07-12 22:08:24 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2014-07-12 22:08:24 +0000 |
| commit | 1f6f0c0012ab5abb88c3984babde9f52558af5a1 (patch) | |
| tree | 47aacc82d361412c7f484d498da9adf066122e49 /usr.sbin/pkg_add | |
| parent | eec0ceabb589a05b3941f517570d3d86322c2a42 (diff) | |
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@
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 10 |
1 files 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 <espie@openbsd.org> # @@ -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 (); } |