From 498498ae2c82c07d5e9ffb9b89d6223df241b667 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 12 Dec 2009 17:18:49 +0000 Subject: update will ask about conflicts, so we need that in updateinfo... --- usr.sbin/pkg_add/OpenBSD/PackingList.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin/pkg_add/OpenBSD/PackingList.pm') 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 # @@ -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($_); } } -- cgit v1.2.3