diff options
Diffstat (limited to 'new-infra/TLTREE.pm')
-rw-r--r-- | new-infra/TLTREE.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/new-infra/TLTREE.pm b/new-infra/TLTREE.pm index c45192b526d..685a1562dc6 100644 --- a/new-infra/TLTREE.pm +++ b/new-infra/TLTREE.pm @@ -167,6 +167,13 @@ sub get_matching_files { # we first substitute arch for ${ARCH} my %returnfiles; foreach $a (@Architectures) { + # return empty list of arch!=win32 and pattern matches bin/win32 + # this is a special case to treat with tlsrc files auto generated + # from tpm files + if (($p =~ m@f bin/win32/@) && ($a ne "win32")) { + $returnfiles{$a} = [ ]; + next; + } my $ARCH = $a; my $newp; eval "\$newp = \"$p\""; @@ -185,6 +192,7 @@ sub _get_matching_files { my ($self, $type, $p) = @_; my ($pattype,$patdata,@rest) = split ' ',$p; my @matchfiles; + &TLUtils::debug("check on $pattype,$patdata,@rest\n"); if ($pattype eq "t") { @matchfiles = $self->_get_files_matching_dir_pattern($type,$patdata,@rest); } elsif ($pattype eq "f") { @@ -196,6 +204,7 @@ sub _get_matching_files { } else { die "Unknown pattern $p"; } + TLUtils::debug("DEBUG: p=$p, matchfiles=@matchfiles\n"); return @matchfiles; } @@ -221,7 +230,8 @@ sub _get_files_matching_glob_pattern { foreach my $f (@candfiles) { &TLUtils::debug("matching $f in $dirpart via glob $globline\n"); if ($f =~ /^$basepart$/) { - push @returnfiles, $f; + &TLUtils::debug("hit: globline=$globline, $dirpart/$f\n"); + push @returnfiles, "$dirpart/$f"; } } return(@returnfiles); |