diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-09-24 08:46:05 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-09-24 08:46:05 +0000 |
| commit | 03f8649bb3c4045a5e22e50b206173adc274d411 (patch) | |
| tree | b70d165cfc6606a6aedb8abe8ee86e3b96bd27d2 /usr.sbin | |
| parent | 6a1e8ca5a3bf5ca3a9c35350a29231df5a200fc2 (diff) | |
use pkgspec_match for default conflict too.
Diffstat (limited to 'usr.sbin')
| -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 107b7ee0fe6..aed27e04558 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.4 2004/09/18 08:14:40 espie Exp $ +# $OpenBSD: PkgCfl.pm,v 1.5 2004/09/24 08:46:04 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -38,7 +38,7 @@ sub make_conflict_list($) unless (defined $plist->{'no-default-conflict'}) { my $stem = (OpenBSD::PackageName::splitname $plist->pkgname())[0]; - push(@$l, sub { grep { m/^\Q$stem\E-\d.*$/ } @_; }); + push(@$l, sub { OpenBSD::PackageName::pkgspec_match($stem."-*", @_); }); } if (defined $plist->{pkgcfl}) { for my $cfl (@{$plist->{pkgcfl}}) { |