Commit 870020f9 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

scripts/get_maintainer.pl: Add -f directory use

Don't require a specific file in a directory to be tested.

Also Arnd Bergmann pointed out that the MAINTAINERS pattern requirement
that directory patterns have a trailing slash was unnecessary and was
likely to be error prone.  Removed that requirement.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 82c4dfc7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
use strict; use strict;
my $P = $0; my $P = $0;
my $V = '0.16'; my $V = '0.17';
use Getopt::Long qw(:config no_auto_abbrev); use Getopt::Long qw(:config no_auto_abbrev);
...@@ -132,6 +132,10 @@ while (<MAINT>) { ...@@ -132,6 +132,10 @@ while (<MAINT>) {
$value =~ s@\.@\\\.@g; ##Convert . to \. $value =~ s@\.@\\\.@g; ##Convert . to \.
$value =~ s/\*/\.\*/g; ##Convert * to .* $value =~ s/\*/\.\*/g; ##Convert * to .*
$value =~ s/\?/\./g; ##Convert ? to . $value =~ s/\?/\./g; ##Convert ? to .
##if pattern is a directory and it lacks a trailing slash, add one
if ((-d $value)) {
$value =~ s@([^/])$@$1/@;
}
} }
push(@typevalue, "$type:$value"); push(@typevalue, "$type:$value");
} elsif (!/^(\s)*$/) { } elsif (!/^(\s)*$/) {
...@@ -146,8 +150,10 @@ close(MAINT); ...@@ -146,8 +150,10 @@ close(MAINT);
my @files = (); my @files = ();
foreach my $file (@ARGV) { foreach my $file (@ARGV) {
next if ((-d $file)); ##if $file is a directory and it lacks a trailing slash, add one
if (!(-f $file)) { if ((-d $file)) {
$file =~ s@([^/])$@$1/@;
} elsif (!(-f $file)) {
die "$P: file '${file}' not found\n"; die "$P: file '${file}' not found\n";
} }
if ($from_filename) { if ($from_filename) {
...@@ -292,7 +298,7 @@ sub file_match_pattern { ...@@ -292,7 +298,7 @@ sub file_match_pattern {
sub usage { sub usage {
print <<EOT; print <<EOT;
usage: $P [options] patchfile usage: $P [options] patchfile
$P [options] -f file $P [options] -f file|directory
version: $V version: $V
MAINTAINER field selection options: MAINTAINER field selection options:
...@@ -322,6 +328,15 @@ Other options: ...@@ -322,6 +328,15 @@ Other options:
--version => show version --version => show version
--help => show this help information --help => show this help information
Notes:
Using "-f directory" may give unexpected results:
Used with "--git", git signators for _all_ files in and below
directory are examined as git recurses directories.
Any specified X: (exclude) pattern matches are _not_ ignored.
Used with "--nogit", directory is used as a pattern match,
no individual file within the directory or subdirectory
is matched.
EOT EOT
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment