From a80e04065f419a5766d84fbe1d599d15e96f76463042828242f1704c5b94c9c7 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 4 Mar 2025 18:36:41 +0100
Subject: [PATCH] list maintainers correctly

---
 devel-importer/main.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/devel-importer/main.go b/devel-importer/main.go
index 728e4dc..85a40d6 100644
--- a/devel-importer/main.go
+++ b/devel-importer/main.go
@@ -489,10 +489,11 @@ func syncOrgTeams(groupName string, teamMembers []common.PersonRepoMeta) []strin
 			}
 
 			for _, m := range membersRes.Payload {
-				for i := range teamMembers {
-					if teamMembers[i].UserID == m.UserName {
+				for i := 0; i < len(teamMembers); {
+					if teamMembers[i].UserID == m.UserName || (teamMembers[i].Role != "maintainer" && teamMembers[i].Role != "") {
 						teamMembers = slices.Delete(teamMembers, i, i+1)
-						break
+					} else {
+						i++
 					}
 				}
 			}
@@ -501,9 +502,6 @@ func syncOrgTeams(groupName string, teamMembers []common.PersonRepoMeta) []strin
 			break
 		}
 
-		if DebugMode && len(teamMembers) > 0 {
-			log.Println("missing team members:", teamMembers)
-		}
 	}
 
 	if !found {
@@ -521,6 +519,10 @@ func syncOrgTeams(groupName string, teamMembers []common.PersonRepoMeta) []strin
 		teamID = team.Payload.ID
 	}
 
+	if DebugMode && len(teamMembers) > 0 {
+		log.Println("missing team members:", teamMembers)
+	}
+
 	for _, user := range teamMembers {
 		_, err := client.Organization.OrgAddTeamMember(organization.NewOrgAddTeamMemberParams().WithID(teamID).WithUsername(user.UserID), r.DefaultAuthentication)
 		if err != nil {