diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-14 12:44:17 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-14 12:44:17 +0000 |
| commit | 653377ecce1715ba23b8e7f723901d2dd5a3cbc3 (patch) | |
| tree | ca69cf724074e48915248d3d403b583c5c74055a /pkgtools/lintpkgsrc | |
| parent | e59cbf9a3495a490f3d486851d942032fe0665c0 (diff) | |
| download | pkgsrc-653377ecce1715ba23b8e7f723901d2dd5a3cbc3.tar.gz | |
lintpkgsrc: fix brace expansion for empty alternatives
Diffstat (limited to 'pkgtools/lintpkgsrc')
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 5 | ||||
| -rw-r--r-- | pkgtools/lintpkgsrc/files/t/glob.t | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 790ffe9fa96..cba0de01617 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.93 2022/08/14 12:42:38 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.94 2022/08/14 12:44:17 rillig Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -253,8 +253,7 @@ sub expand_braces($str) { while (defined($str = shift @todo)) { # FIXME: see test_expand_braces. if ($str =~ /(.*) \{ ([^{}]+) } (.*)/x) { - # FIXME: see test_expand_braces. - foreach (split(',', $2)) { + foreach (split(',', $2, -1)) { push @todo, "$1$_$3"; } } else { diff --git a/pkgtools/lintpkgsrc/files/t/glob.t b/pkgtools/lintpkgsrc/files/t/glob.t index bc104275b40..16ff2de6575 100644 --- a/pkgtools/lintpkgsrc/files/t/glob.t +++ b/pkgtools/lintpkgsrc/files/t/glob.t @@ -1,4 +1,4 @@ -# $NetBSD: glob.t,v 1.10 2022/08/14 12:42:38 rillig Exp $ +# $NetBSD: glob.t,v 1.11 2022/08/14 12:44:17 rillig Exp $ # # Tests for file globbing and matching. @@ -63,8 +63,7 @@ sub test_expand_braces() { [ '', ], [ 'abc', 'abc' ], [ '{a,b,c}', 'a', 'b', 'c' ], - # FIXME: '<>' is missing. - [ '<{opt,}>', '<opt>' ], + [ '<{opt,}>', '<opt>', '<>' ], [ '<{,opt}>', '<>', '<opt>' ], [ '{0,1,2}', '0', '1', '2' ], [ '{2,1,0}', '2', '1', '0' ], |