CVS commit: pkgsrc/pkgtools/lintpkgsrc/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jul 30 09:37:21 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
lintpkgsrc: merge duplicate code


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.33 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.34
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.33 Sat Jul 30 09:32:05 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Sat Jul 30 09:37:21 2022
@@ -1,6 +1,6 @@
 #!@PERL5@
 
-# $NetBSD: lintpkgsrc.pl,v 1.33 2022/07/30 09:32:05 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.34 2022/07/30 09:37:21 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -368,19 +368,6 @@ sub pkgversioncmp($$$) {
        eval "$cmp $test 0";
 }
 
-sub parse_expand_vars_dumb($$) {
-       my ($line, $vars) = @_;
-
-       while ($line =~ /\$\{([-\w.]+)\}/) {
-               if (defined(${$vars}{$1})) {
-                       $line = $` . ${$vars}{$1} . $';
-               } else {
-                       $line = $` . $magic_undefined . $';
-               }
-       }
-       $line;
-}
-
 sub parse_expand_vars($$) {
        my ($line, $vars) = @_;
 
@@ -399,7 +386,7 @@ sub parse_eval_make_false($$) {
        my ($false, $test);
 
        $false = 0;
-       $test = parse_expand_vars_dumb($line, $vars);
+       $test = parse_expand_vars($line, $vars);
 
        # XXX This is _so_ wrong - need to parse this correctly
        $test =~ s/""/\r/g;