diff options
| author |   espie <espie@openbsd.org> | 2010-01-05 11:42:45 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2010-01-05 11:42:45 +0000 |
| commit | 553c8849846f396b69a3281517d8347c0c61f37f (patch) | |
| tree | 2e60ba1cdb30c2556df2ebeb0bf046e62ee3e156 | |
| parent | use Auto::cache (diff) | |
| download | wireguard-openbsd-553c8849846f396b69a3281517d8347c0c61f37f.tar.xz wireguard-openbsd-553c8849846f396b69a3281517d8347c0c61f37f.zip | |
avoid loop if conflict/replace end up finding kept handles.
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index e3e50492965..cf3094cca56 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.461 2010/01/05 11:31:07 espie Exp $ +# $OpenBSD: pkg_add,v 1.462 2010/01/05 11:42:45 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -298,6 +298,7 @@ sub install_issues } next if defined $set->{older}->{$toreplace}; + next if defined $set->{kept}->{$toreplace}; $later = 1; my $s = $state->tracker->is_to_update($toreplace); |