jmq/Documentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prtwash: use stricter regex to identify latest built package

Browse Source
This commit is contained in:
John McQuah 2023-11-16 23:54:02 +00:00
parent bb58beecda
commit 9f5096eb27
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/prtwash.pl
View File

@ -156,7 +156,7 @@ sub keeplist { # remember to pop off the last two elements for regex purposes
push(@keepers, $ki); push(@keepers, $ki);
} }
} }
push (@keepers, "$name#$version.*\.pkg\.tar\.$compression_mode"); push (@keepers, "$name#$version-$release\.pkg\.tar\.$compression_mode");
push (@keepers, "$name#.*\.pkg\.tar\.$compression_mode"); push (@keepers, "$name#.*\.pkg\.tar\.$compression_mode");
return @keepers; return @keepers;
} }
@ -192,7 +192,7 @@ sub do_wash {
foreach my $f (sort(readdir(DIR))) { foreach my $f (sort(readdir(DIR))) {
next if ($f eq '.' or $f eq '..'); next if ($f eq '.' or $f eq '..');
if ($iswanted{$f} or ($options{pkgtoo}==0)*($f =~ /$currbuild/) if ($iswanted{$f} or ($options{pkgtoo}==0)*($f =~ /$currbuild/)
or ($options{oldver}==0)*($f =~ /$allbuilds/)*($f !~ /$currbuild/)) { or ($options{oldver}==0)*($f =~ /$allbuilds/)*($f !~ /$currbuild/)) {
print "... keeping file $port/$f.\n" unless $options{quiet} == 1; print "... keeping file $port/$f.\n" unless $options{quiet} == 1;
} else { } else {
remove ("$port/$f"); remove ("$port/$f");
@ -214,7 +214,6 @@ sub getportdirs { # returns scalar references to two arrays
$line =~ s/^prtdir\s+//; #remove the leading directive $line =~ s/^prtdir\s+//; #remove the leading directive
$line =~ s/#.*$//; #strip inline comments like this one $line =~ s/#.*$//; #strip inline comments like this one
$line =~ s/\s+//g; #collapse all whitespace, even if in a path! $line =~ s/\s+//g; #collapse all whitespace, even if in a path!
#(not that we ever put spaces or commas in repo names anyway)
if ( $line !~ /:/ ) { if ( $line !~ /:/ ) {
push @basedirs, $line if (-d $line); push @basedirs, $line if (-d $line);
} else { } else {