| Message ID | b074bb1de3366dddbdde8e34703e35d9e6e1eab8.1567195654.git-series.lars.kurth@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Allow get_maintainer.pl / add_maintainers.pl scripts to be called outside of xen.git | expand |
On 30.08.2019 22:09, Lars Kurth wrote: > Specifically: > * Move check until after the MAINTAINERS file has been read > * Add get_xen_maintainers_file_version() for check > * Remove top_of_tree as not needed any more > * Faiul with extended error message when used out of tree > > Signed-off-by: Lars Kurth <lars.kurth@citrix.com> Just a couple of nits (my Perl is far from good enough to actually give an ack): > @@ -311,6 +306,16 @@ while (<$maint>) { > } > close($maint); > > +# Check whether we have a V entry under the REST > +# hnd use it to get the file's version number s/hnd/and/ > @@ -564,6 +569,32 @@ sub range_has_maintainer { > return 0; > } > > +sub get_xen_maintainers_file_version { > + my $tvi = find_first_section(); > + > + while ($tvi < @typevalue) { > + my $start = find_starting_index($tvi); > + my $end = find_ending_index($tvi); > + my $i; > + > + for ($i = $start; $i < $end; $i++) { > + my $line = $typevalue[$i]; > + if ($line =~ m/^V:\s*(.*)/) { A hard tab looks to have slipped in here. > + my $type = $1; This variable looks to be unused, but perhaps its declaration has some side effect? Jan
On 02/09/2019, 09:08, "Jan Beulich" <jbeulich@suse.com> wrote:
On 30.08.2019 22:09, Lars Kurth wrote:
> Specifically:
> * Move check until after the MAINTAINERS file has been read
> * Add get_xen_maintainers_file_version() for check
> * Remove top_of_tree as not needed any more
> * Faiul with extended error message when used out of tree
>
> Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
Just a couple of nits (my Perl is far from good enough to actually
give an ack):
> @@ -311,6 +306,16 @@ while (<$maint>) {
> }
> close($maint);
>
> +# Check whether we have a V entry under the REST
> +# hnd use it to get the file's version number
s/hnd/and/
I really shouldn't send patches out in a rush. Thank you!
> @@ -564,6 +569,32 @@ sub range_has_maintainer {
> return 0;
> }
>
> +sub get_xen_maintainers_file_version {
> + my $tvi = find_first_section();
> +
> + while ($tvi < @typevalue) {
> + my $start = find_starting_index($tvi);
> + my $end = find_ending_index($tvi);
> + my $i;
> +
> + for ($i = $start; $i < $end; $i++) {
> + my $line = $typevalue[$i];
> + if ($line =~ m/^V:\s*(.*)/) {
A hard tab looks to have slipped in here.
> + my $type = $1;
This variable looks to be unused, but perhaps its declaration
has some side effect?
It is really unneeded
Lars
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 174dfb7..fe84a12 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -265,11 +265,6 @@ if ($email && die "$P: Please select at least 1 email option\n"; } -if (!top_of_tree($xen_path)) { - die "$P: The current directory does not appear to be " - . "a Xen source tree.\n"; -} - ## Read MAINTAINERS for type/value pairs my @typevalue = (); @@ -311,6 +306,16 @@ while (<$maint>) { } close($maint); +# Check whether we have a V entry under the REST +# hnd use it to get the file's version number +my $maintainers_file_version = get_xen_maintainers_file_version(); +if (!$maintainers_file_version) { + die "$P: the MAINTAINERS file ". + "in the current directory does not appear to be from ". + "the xen.git source tree or a sister tree.\n\n". + "A 'V: xen-maintainers-<version>' entry under THE REST ". + "is needed to identify a Xen MAINTAINERS file.\n\n"; +} # # Read mail address map @@ -564,6 +569,32 @@ sub range_has_maintainer { return 0; } +sub get_xen_maintainers_file_version { + my $tvi = find_first_section(); + + while ($tvi < @typevalue) { + my $start = find_starting_index($tvi); + my $end = find_ending_index($tvi); + my $i; + + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^V:\s*(.*)/) { + my $type = $1; + # Note that get_maintainer_role() requires processing + # of more of the file. So do it directly + if ($typevalue[$start] eq "THE REST") { + if ($line =~ m/xen-maintainers-(.*)/) { + return $1; + } + } + } + } + $tvi = $end + 1; + } + return 0; +} + sub get_maintainers { %email_hash_name = (); %email_hash_address = (); @@ -867,23 +898,6 @@ Notes: EOT } -sub top_of_tree { - my ($xen_path) = @_; - - if ($xen_path ne "" && substr($xen_path,length($xen_path)-1,1) ne "/") { - $xen_path .= "/"; - } - if ( (-f "${xen_path}COPYING") - && (-f "${xen_path}MAINTAINERS") - && (-f "${xen_path}Makefile") - && (-d "${xen_path}docs") - && (-f "${xen_path}CODING_STYLE") - && (-d "${xen_path}xen")) { - return 1; - } - return 0; -} - sub parse_email { my ($formatted_email) = @_;
Specifically: * Move check until after the MAINTAINERS file has been read * Add get_xen_maintainers_file_version() for check * Remove top_of_tree as not needed any more * Faiul with extended error message when used out of tree Signed-off-by: Lars Kurth <lars.kurth@citrix.com> --- scripts/get_maintainer.pl | 58 ++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 22 deletions(-)