After introducing the --substatus option, we can stop adjusting the
reported maintainer role by the subsystem's status.

For compatibility with the --git-chief-penguins option, keep the "chief
penguin" role.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
 scripts/get_maintainer.pl | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index da7fc70f17cd8d46b45da8db0b2029bb11b25af1..cf902417a52cccfd5dd00ac7d2fe43d9f43d2528 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -1084,7 +1084,7 @@ version: $V
     --moderated => include moderated lists(s) if any (default: true)
     --s => include subscriber only list(s) if any (default: false)
     --remove-duplicates => minimize duplicate email names/addresses
-    --roles => show roles (status:subsystem, git-signer, list, etc...)
+    --roles => show roles (role:subsystem, git-signer, list, etc...)
     --rolestats => show roles and statistics (commits/total_commits, %)
     --substatus => show subsystem status if not Maintained (default: match --roles)"
     --file-emails => add email addresses found in -f file (default: 0 (off))
@@ -1298,8 +1298,9 @@ sub get_maintainer_role {
     my $start = find_starting_index($index);
     my $end = find_ending_index($index);
 
-    my $role = "unknown";
+    my $role = "maintainer";
     my $subsystem = get_subsystem_name($index);
+    my $status = "unknown";
 
     for ($i = $start + 1; $i < $end; $i++) {
 	my $tv = $typevalue[$i];
@@ -1307,23 +1308,13 @@ sub get_maintainer_role {
 	    my $ptype = $1;
 	    my $pvalue = $2;
 	    if ($ptype eq "S") {
-		$role = $pvalue;
+		$status = $pvalue;
 	    }
 	}
     }
 
-    $role = lc($role);
-    if      ($role eq "supported") {
-	$role = "supporter";
-    } elsif ($role eq "maintained") {
-	$role = "maintainer";
-    } elsif ($role eq "odd fixes") {
-	$role = "odd fixer";
-    } elsif ($role eq "orphan") {
-	$role = "orphan minder";
-    } elsif ($role eq "obsolete") {
-	$role = "obsolete minder";
-    } elsif ($role eq "buried alive in reporters") {
+    $status = lc($status);
+    if ($status eq "buried alive in reporters") {
 	$role = "chief penguin";
     }
 

-- 
2.48.1

On Mon, Feb 03, 2025 at 12:13:17PM +0100, Vlastimil Babka wrote:
> After introducing the --substatus option, we can stop adjusting the
> reported maintainer role by the subsystem's status.
>
> For compatibility with the --git-chief-penguins option, keep the "chief
> penguin" role.
>
> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

LGTM,

Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>

Tested locally and working, so also:

Tested-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>

> ---
>  scripts/get_maintainer.pl | 21 ++++++---------------
>  1 file changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> index da7fc70f17cd8d46b45da8db0b2029bb11b25af1..cf902417a52cccfd5dd00ac7d2fe43d9f43d2528 100755
> --- a/scripts/get_maintainer.pl
> +++ b/scripts/get_maintainer.pl
> @@ -1084,7 +1084,7 @@ version: $V
>      --moderated => include moderated lists(s) if any (default: true)
>      --s => include subscriber only list(s) if any (default: false)
>      --remove-duplicates => minimize duplicate email names/addresses
> -    --roles => show roles (status:subsystem, git-signer, list, etc...)
> +    --roles => show roles (role:subsystem, git-signer, list, etc...)
>      --rolestats => show roles and statistics (commits/total_commits, %)
>      --substatus => show subsystem status if not Maintained (default: match --roles)"
>      --file-emails => add email addresses found in -f file (default: 0 (off))
> @@ -1298,8 +1298,9 @@ sub get_maintainer_role {
>      my $start = find_starting_index($index);
>      my $end = find_ending_index($index);
>
> -    my $role = "unknown";
> +    my $role = "maintainer";
>      my $subsystem = get_subsystem_name($index);
> +    my $status = "unknown";
>
>      for ($i = $start + 1; $i < $end; $i++) {
>  	my $tv = $typevalue[$i];
> @@ -1307,23 +1308,13 @@ sub get_maintainer_role {
>  	    my $ptype = $1;
>  	    my $pvalue = $2;
>  	    if ($ptype eq "S") {
> -		$role = $pvalue;
> +		$status = $pvalue;
>  	    }
>  	}
>      }
>
> -    $role = lc($role);
> -    if      ($role eq "supported") {
> -	$role = "supporter";
> -    } elsif ($role eq "maintained") {
> -	$role = "maintainer";
> -    } elsif ($role eq "odd fixes") {
> -	$role = "odd fixer";
> -    } elsif ($role eq "orphan") {
> -	$role = "orphan minder";
> -    } elsif ($role eq "obsolete") {
> -	$role = "obsolete minder";
> -    } elsif ($role eq "buried alive in reporters") {
> +    $status = lc($status);
> +    if ($status eq "buried alive in reporters") {
>  	$role = "chief penguin";
>      }
>
>
> --
> 2.48.1
>