From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BBC3C3279B for ; Fri, 6 Jul 2018 22:32:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4C50208F7 for ; Fri, 6 Jul 2018 22:32:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4C50208F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240AbeGFWcl (ORCPT ); Fri, 6 Jul 2018 18:32:41 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50196 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753707AbeGFWck (ORCPT ); Fri, 6 Jul 2018 18:32:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88D29CB9F0; Fri, 6 Jul 2018 22:32:39 +0000 (UTC) Received: from redhat.com (ovpn-124-65.rdu2.redhat.com [10.10.124.65]) by smtp.corp.redhat.com (Postfix) with SMTP id 42AB82156889; Fri, 6 Jul 2018 22:32:39 +0000 (UTC) Date: Fri, 6 Jul 2018 18:32:39 -0400 From: Don Zickus To: Joe Perches Cc: Prarit Bhargava , linux-kernel@vger.kernel.org, jtoppins@redhat.com Subject: Re: [PATCH] get_maintainer.pl: Add optional .get_maintainer.MAINTAINERS override Message-ID: <20180706223239.orndeyykylebltfs@redhat.com> References: <20180626182505.4176-1-prarit@redhat.com> <601f0e6bf3baa88b9f6145e635d728a435542292.camel@perches.com> <20180706175419.6irtvs64e6dbz7hk@redhat.com> <20180706184411.ilzbt7fxuje2nhx6@redhat.com> <716eb88d-31ac-c488-f799-dec9c9afb5af@redhat.com> <948af2d06623e8fcca6f0c0fd300a65bbfd1c6fa.camel@perches.com> <20180706215851.sqpibusyqukbh55g@redhat.com> <5ebb181efcdd2cdb3c1ee8eac9bba26f5759a0ea.camel@perches.com> <9efeba75a47e9b0c40d5b9e5078598ff4a31f196.camel@perches.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9efeba75a47e9b0c40d5b9e5078598ff4a31f196.camel@perches.com> User-Agent: NeoMutt/20180622 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 06 Jul 2018 22:32:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 06 Jul 2018 22:32:39 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dzickus@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 06, 2018 at 03:14:28PM -0700, Joe Perches wrote: > On Fri, 2018-07-06 at 15:09 -0700, Joe Perches wrote: > > On Fri, 2018-07-06 at 17:58 -0400, Don Zickus wrote: > > > We have an internal use case of multiple MAINTAINER files, some folks have > > > more rights to patches than others so they are not allowed to be cc'd (think > > > embargoed stuff). > > How about: Oh by the way, you can probably mimic my testing by doing mkdir test cp MAINTAINERS test/ ./scripts/get_maintainer.pl --find-maintainer-files test/ ./scripts/get_maintainer.pl --find-maintainer-files test/MAINTAINERS If that helps. Cheers, Don > --- > scripts/get_maintainer.pl | 39 +++++++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 18 deletions(-) > > diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl > index c87fa734e3e1..f7a7d46340a8 100755 > --- a/scripts/get_maintainer.pl > +++ b/scripts/get_maintainer.pl > @@ -60,7 +60,7 @@ my $pattern_depth = 0; > my $self_test = undef; > my $version = 0; > my $help = 0; > -my $find_maintainer_files = 0; > +my $find_maintainer_files; > > my $vcs_used = 0; > > @@ -262,7 +262,7 @@ if (!GetOptions( > 'sections!' => \$sections, > 'fe|file-emails!' => \$file_emails, > 'f|file' => \$from_filename, > - 'find-maintainer-files' => \$find_maintainer_files, > + 'find-maintainer-files:s' => \$find_maintainer_files, > 'self-test:s' => \$self_test, > 'v|version' => \$version, > 'h|help|usage' => \$help, > @@ -384,26 +384,29 @@ sub find_ignore_git { > read_all_maintainer_files(); > > sub read_all_maintainer_files { > - if (-d "${lk_path}MAINTAINERS") { > - opendir(DIR, "${lk_path}MAINTAINERS") or die $!; > - my @files = readdir(DIR); > - closedir(DIR); > - foreach my $file (@files) { > - push(@mfiles, "${lk_path}MAINTAINERS/$file") if ($file !~ /^\./); > - } > - } > - > - if ($find_maintainer_files) { > - find( { wanted => \&find_is_maintainer_file, > - preprocess => \&find_ignore_git, > - no_chdir => 1, > - }, "${lk_path}"); > + my $path = defined $find_maintainer_files && $find_maintainer_files ne "" > + ? $find_maintainer_files : $lk_path; > + if (-d "${path}MAINTAINERS") { > + opendir(DIR, "${path}MAINTAINERS") or die $!; > + my @files = readdir(DIR); > + closedir(DIR); > + foreach my $file (@files) { > + push(@mfiles, "${path}MAINTAINERS/$file") if ($file !~ /^\./); > + } > + } > + > + if (defined $find_maintainer_files && (-d $find_maintainer_files)) { > + find( { wanted => \&find_is_maintainer_file, > + preprocess => \&find_ignore_git, > + no_chdir => 1, > + }, "${path}"); > } else { > - push(@mfiles, "${lk_path}MAINTAINERS") if -f "${lk_path}MAINTAINERS"; > + push(@mfiles, "${path}MAINTAINERS") if -f "${path}MAINTAINERS"; > } > > + die "$P: No MAINTAINER files found in $path\n" if (scalar(@mfiles) == 0); > foreach my $file (@mfiles) { > - read_maintainer_file("$file"); > + read_maintainer_file("$file"); > } > } >