diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-09-18 08:14:41 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-09-18 08:14:41 +0000 |
| commit | fc383c6c1b3770410e0fabb27d4e02af846bc297 (patch) | |
| tree | ab4367f110495ece3caf0042426de7cf597a8e42 /usr.sbin/pkg_add/OpenBSD/PackingList.pm | |
| parent | 7ebccf053fce13d43924c8f464eea9e6ff4335e8 (diff) | |
new-style conflicts that respect pkgspec.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/PackingList.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index f6f26f48359..b9c5b4c88ac 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.23 2004/09/16 07:46:00 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.24 2004/09/18 08:14:40 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -96,7 +96,7 @@ sub ConflictOnly my ($fh, $cont) = @_; local $_; while (<$fh>) { - next unless m/^\@(?:pkgcfl|option|name)\b/; + next unless m/^\@(?:pkgcfl|conflict|option|name)\b/; &$cont($_); } } @@ -134,7 +134,7 @@ sub write for my $unique_item (qw(name no-default-conflict manual-installation extrainfo arch)) { $self->{$unique_item}->write($fh) if defined $self->{$unique_item}; } - for my $listname (qw(modules pkgcfl pkgdep newdepend libdepend items)) { + for my $listname (qw(modules pkgcfl conflict pkgdep newdepend libdepend items)) { if (defined $self->{$listname}) { for my $item (@{$self->{$listname}}) { $item->write($fh); @@ -163,7 +163,7 @@ sub visit for my $unique_item (qw(name no-default-conflict manual-installation extrainfo arch)) { $self->{$unique_item}->$method(@l) if defined $self->{$unique_item}; } - for my $listname (qw(modules pkgcfl pkgdep newdepend libdepend items)) { + for my $listname (qw(modules pkgcfl conflict pkgdep newdepend libdepend items)) { if (defined $self->{$listname}) { for my $item (@{$self->{$listname}}) { $item->$method(@l); |