diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-07 12:08:37 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-07 12:08:37 +0000 |
| commit | 5807fa618b971d595c11c940ba1a7339d4b0aa76 (patch) | |
| tree | c4cff1302514aed1d40028a11233572e55fef824 | |
| parent | 140f5146a2850cf6e568662e7383fd74d1d91adc (diff) | |
PkgSpec::match does the right thing, so use it there too.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCfl.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm index 108ed4e7a10..269af2c4abe 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PkgCfl.pm,v 1.15 2007/05/07 08:24:16 espie Exp $ +# $OpenBSD: PkgCfl.pm,v 1.16 2007/05/07 12:08:36 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # @@ -38,7 +38,7 @@ sub make_conflict_list push(@$l, sub { OpenBSD::PkgSpec::match("$stem-*|partial-$stem-*", @_); }); } else { $pkgname =~ s/p\d+$//; - push(@$l, sub { my $a; grep { $a = $_; $a =~ s/p\d+$//; $a eq $pkgname || $a eq "partial-$pkgname"} @_;}); + push(@$l, sub { OpenBSD::PkgSpec::match("$pkgname|partial-$pkgname", @_);}); } push(@$l, sub { OpenBSD::PkgSpec::match(".libs-$stem-*", @_); }); if (defined $plist->{conflict}) { |