summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2005-09-19 09:51:02 +0000
committerMarc Espie <espie@cvs.openbsd.org>2005-09-19 09:51:02 +0000
commit4128d5c501961d62696743aaa00e1a3441598b4e (patch)
treeb664591e4a5ec390db42d6e0a564bbe8a59e7c10
parent479b2d4168c079f6fe8738591f67e16c0ac0fed5 (diff)
Let ExtraInfoOnly grab pkgpath as well.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingList.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
index 4d27e20ba2d..119ae002f0a 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.49 2005/09/07 10:39:25 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.50 2005/09/19 09:51:01 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -155,7 +155,13 @@ sub ExtraInfoOnly
while (<$fh>) {
# XXX optimization
if (m/^\@arch\b/o) {
- &$cont($_);
+ while (<$fh>) {
+ if (m/^\@(?:pkgpath)\b/o) {
+ &$cont($_);
+ } elsif (m/^\@(?:groups|users|cwd)\b/o) {
+ last;
+ }
+ }
return;
}
next unless m/^\@(?:name\b|comment\s+subdir\=)/o;