Sun Sep 9 15:47:35 2012 UTC ()

use file::find to save memory in lintpkgsrc- should never grow more than 25MB now -- makes no effort to clean up empty directories, so that is still fixable


(mspo)

diff -r1.1 -r1.2 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2012/07/13 21:12:07 1.1
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2012/09/09 15:47:35 1.2

 @@ -1,16 +1,16 @@
 #! @PERL@
-# $NetBSD: lintpkgsrc.pl,v 1.1 2012/07/13 21:12:07 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.2 2012/09/09 15:47:35 mspo Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 $^W = 1;
 @@ -591,26 +591,28 @@ sub invalid_version($) {
+        }
         else {
             # If we find one match, don't bitch about others
             $ok = 1;
+        }
+    }
     $ok && ( $fail = undef );
     $fail;
+}
 # List (recursive) non directory contents of specified directory
+#
 #TODO this entire sub should be replaced with direct calls to
 #     File::Find
 sub listdir($$) {
     my ( $base, $dir ) = @_;
     my ($thisdir);
     my ( @list, @thislist );
     $thisdir = $base;
     if ( defined($dir) ) {
         $thisdir .= "/$dir";
         $dir     .= '/';
+    }
     else {
         $dir = '';
+    }
 @@ -1496,39 +1498,58 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$
                 close(DISTINFO);
+            }
+        }
         verbose('.');
+    }
     verbose(" ($numpkg packages)\n");
     # Do not mark the vulnerabilities file as unknown
     $distfiles{'pkg-vulnerabilities'} = {
         path => 'pkg-vulnerabilities',
         sum  => 'IGNORE'
     };
-    foreach my $file ( listdir( "$pkgdistdir", undef ) ) {
+# bad for memory
-        my ($dist);
+#    foreach my $file ( listdir( "$pkgdistdir", undef ) ) {
 #        my ($dist);
         if ( !defined( $dist = $distfiles{$file} ) ) {
-            $bad_distfiles{$file} = 1;
+#        if ( !defined( $dist = $distfiles{$file} ) ) {
 #            $bad_distfiles{$file} = 1;
+#
-        else {
+#        }
-            if ( $dist->{sum} ne 'IGNORE' ) {
+#        else {
-                push( @{ $sumfiles{ $dist->{sumtype} } }, $file );
+#            if ( $dist->{sum} ne 'IGNORE' ) {
 #                push( @{ $sumfiles{ $dist->{sumtype} } }, $file );
 #            }
 #        }
 #    }
 # check each file in $pkgdistdir
     find ( { wanted => sub {
             my ($dist);
             if ( -f $File::Find::name )
+            {
                 my $distn = $File::Find::name;
                 $distn =~ s/$pkgdistdir\/?//g;
                 if ( !defined ($dist = $distfiles{$distn} ) ) {
                     $bad_distfiles{$distn} = 1;
+                }
                 else {
                     if ( $dist->{sum} ne 'IGNORE' ) {
                         push( @{ $sumfiles{ $dist->{sumtype} } }, $distn );
+                    }
+                }
+            }
         } },
         ($pkgdistdir) );
     if ( $check_unref && %bad_distfiles ) {
         verbose( scalar( keys %bad_distfiles ),
             " unreferenced file(s) in '$pkgdistdir':\n" );
         print join( "\n", sort keys %bad_distfiles ), "\n";
+    }
     if ($check_distinfo) {
         if (@distwarn) {
             verbose(@distwarn);
+        }
         verbose("checksum mismatches\n");