diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-09-05 11:41:04 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-09-05 11:41:04 +0000 |
| commit | 301ba798836a8a1229a915a8e2f9c5efca8b2370 (patch) | |
| tree | 06c196fdd1ada56b307c189b5d2566676dabb8b7 /usr.sbin/pkg_add | |
| parent | 53234a779b9c0ddd6b171627573faf5db1aa02fe (diff) | |
Missing -F installed test.
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index b933eade4e0..d2051cdc599 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.198 2005/09/04 22:53:51 espie Exp $ +# $OpenBSD: pkg_add,v 1.199 2005/09/05 11:41:03 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -63,7 +63,8 @@ sub can_install($$$) my %conflicts = map {($_,1)} @conflicts; if ((keys %conflicts) == 1 && (keys %conflicts)[0] eq $pkgname) { - if (!has_new_sig($plist, $state)) { + if (!$state->{forced}->{installed} && + !has_new_sig($plist, $state)) { print "Already installed: $pkgname\n"; return 1; } |