diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-08-12 18:41:36 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-08-12 18:41:36 +0000 |
| commit | 44970fff959bd5cea7392da813d543f17123ef8e (patch) | |
| tree | b014496d96e408b39d364032448f39f6f30fa2fe | |
| parent | 0f98a191e9250027aad532689818d78b8337531e (diff) | |
minor semantic tweak: foo-1.0 needs to conflict with foo-1.0p0, always,
even in @option no-default-conflict, for updates to actually work.
okay henning@
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCfl.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm index 6f54b065cd1..2cd101acc34 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.11 2005/03/14 08:46:24 espie Exp $ +# $OpenBSD: PkgCfl.pm,v 1.12 2005/08/12 18:41:35 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -47,7 +47,8 @@ sub make_conflict_list unless (defined $plist->{'no-default-conflict'}) { push(@$l, sub { OpenBSD::PkgSpec::match("$stem-*|partial-$stem-*", @_); }); } else { - push(@$l, sub { grep { $_ eq $pkgname || $_ eq "partial-$pkgname"} @_;}); + $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(".libs-$stem-*", @_); }); if (defined $plist->{pkgcfl}) { |