checking for firmware works better if I pass thru all options
authorespie <espie@openbsd.org>
Wed, 27 Jul 2016 13:02:03 +0000 (13:02 +0000)
committerespie <espie@openbsd.org>
Wed, 27 Jul 2016 13:02:03 +0000 (13:02 +0000)
usr.sbin/pkg_add/OpenBSD/PackingList.pm

index c0100f6..ee73a21 100644 (file)
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingList.pm,v 1.137 2016/06/25 18:02:59 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.138 2016/07/27 13:02:03 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -257,7 +257,7 @@ sub ExtraInfoOnly
 {
        my ($fh, $cont) = @_;
        while (<$fh>) {
-               if (m/^\@(?:name|pkgpath|comment\s+(?:subdir|pkgpath)\=|option\s+is-branch)\b/o) {
+               if (m/^\@(?:name|pkgpath|comment\s+(?:subdir|pkgpath)\=|option)\b/o) {
                        &$cont($_);
                # XXX optimization
                } elsif (m/^\@(?:depend|wantlib|newgroup|newuser|cwd)\b/o) {