diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-12 17:18:49 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-12 17:18:49 +0000 |
| commit | 498498ae2c82c07d5e9ffb9b89d6223df241b667 (patch) | |
| tree | 659a649d1a1ae2d36a379fa3da7c0785d43f44cf /usr.sbin | |
| parent | fad066aae302cbfd7576787fa4ffca325e506809 (diff) | |
update will ask about conflicts, so we need that in updateinfo...
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index b9d15a9ab2e..812ff38194c 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.93 2009/12/12 07:44:03 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.94 2009/12/12 17:18:48 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -234,7 +234,7 @@ sub UpdateInfoOnly # XXX optimization if (m/^\@arch\b/o) { while (<$fh>) { - if (m/^\@(?:depend|wantlib|pkgpath)\b/o) { + if (m/^\@(?:depend|wantlib|conflict|option|pkgpath)\b/o) { &$cont($_); } elsif (m/^\@(?:groups|users|cwd)\b/o) { last; @@ -250,7 +250,7 @@ sub UpdateInfoOnly } return; } - next unless m/^\@(?:name\b|depend\b|wantlib\b|pkgpath\b|comment\s+subdir\=|arch\b)/o; + next unless m/^\@(?:name\b|depend\b|wantlib\b|conflict|\b|option\b|pkgpath\b|comment\s+subdir\=|arch\b)/o; &$cont($_); } } |