diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-28 12:51:27 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-28 12:51:27 +0000 |
| commit | 3eb56ed12b79d02ae89d6f9b5e4c82acfedeef91 (patch) | |
| tree | 6eb9707882e2c34dcbc9a4de323832d12f29e035 /usr.sbin/pkg_add/OpenBSD | |
| parent | df21489bc4a8c527014cd466bc237d7c7ad3a507 (diff) | |
move code around a bit, more functions. Especially do the exec check
ways later, when we're certain we're not going to change the set any longer,
so we don't need to go back.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 372134586ae..36bd8b3733c 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.64 2009/12/27 15:32:20 espie Exp $ +# $OpenBSD: Replace.pm,v 1.65 2009/12/28 12:51:26 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -309,14 +309,10 @@ sub is_set_safe my $ok = 1; for my $pkg ($set->older) { - next if defined $pkg->{exec_checked}; $ok = 0 unless can_old_package_be_replaced($pkg->plist, $state); - $pkg->{exec_checked} = 1; } for my $pkg ($set->newer) { - next if defined $pkg->{exec_checked}; $ok = 0 unless is_new_package_safe($pkg->plist, $state); - $pkg->{exec_checked} = 1; } return 1 if $ok; |