The branch master has been updated
via cbda6bd72e4abbe16a4a260312b1289a0e9e4764 (commit)
from 73b0391902c67f9ebfcd5fa96cc10734d9631da8 (commit)
- Log -----------------------------------------------------------------
commit cbda6bd72e4abbe16a4a260312b1289a0e9e4764
Author: Nicola Tuveri <nic....@gmail.com>
Date: Sun Jan 5 10:52:57 2020 +0200
Apply OTC changes to gitaddrev
After the changes in https://github.com/openssl/web/pull/146
`gitaddrev` (on which `addrev` depends) required an update to count OTC
approvals rather than OMC approvals.
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/tools/pull/50)
-----------------------------------------------------------------------
Summary of changes:
review-tools/gitaddrev | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev
index 1c2071e..177a92a 100755
--- a/review-tools/gitaddrev
+++ b/review-tools/gitaddrev
@@ -29,7 +29,7 @@ my @reviewers;
my @nocla_reviewers;
my @unknown_reviewers;
my $skip_reviewer;
-my $omccount = 0;
+my $otccount = 0;
sub try_add_reviewer {
my $id = shift;
my $rc = undef;
@@ -39,7 +39,7 @@ sub try_add_reviewer {
my $cla = $query->has_cla(lc $rev);
if ($cla) {
unless (grep {$_ eq $rev} @reviewers) {
- $omccount++ if $query->is_member_of($id2, 'omc');
+ $otccount++ if $query->is_member_of($id2, 'otc');
push @reviewers, $rev;
}
$rc = $rev;
@@ -64,9 +64,9 @@ foreach (@ARGV) {
foreach ($query->list_people()) {
my $email_id = (grep { ref($_) eq "" && $_ =~ m|\@| } @$_)[0];
my $rev = $query->find_person_tag($email_id, 'rev');
- my $omc = $query->is_member_of($email_id, 'omc');
+ my $otc = $query->is_member_of($email_id, 'otc');
next unless $query->has_cla(lc $rev);
- next unless $query->is_member_of($email_id, 'commit') || $omc;
+ next unless $query->is_member_of($email_id, 'commit') || $otc;
my @ids =
sort grep { $_ =~ /^[a-z]+$/ || $_ =~ /^\@(?:\w|\w-\w)+$/ }
map {
@@ -78,13 +78,13 @@ foreach (@ARGV) {
}
} @$_;
foreach (@ids) {
- $list{$_} = { tag => $rev, omc => $omc };
+ $list{$_} = { tag => $rev, otc => $otc };
}
}
foreach (sort { my $res = $list{$a}->{tag} cmp $list{$b}->{tag};
$res != 0 ? $res : ($a cmp $b) } keys %list) {
printf "%-15s %-6s (%s)\n",
- $_, $list{$_}->{omc} ? "[OMC]" : "", $list{$_}->{tag};
+ $_, $list{$_}->{otc} ? "[OTC]" : "", $list{$_}->{tag};
}
exit 0;
} elsif (/^--reviewer=(.+)$/) {
@@ -158,8 +158,8 @@ print STDERR "Going with these reviewers:\n ", join("\n
", @reviewers), "\n"
if (scalar @reviewers < 2) {
die "Too few reviewers (total must be at least 2)\n";
}
-if ($omccount < 1) {
- die "At least one of the reviewers must be an OMC member\n";
+if ($otccount < 1) {
+ die "At least one of the reviewers must be an OTC member\n";
}
if ($skip_reviewer) {
@reviewers = grep { $_ ne $skip_reviewer } @reviewers;
