18858: Improves test & fixes discovered bug by said improved test.

[arvados.git] / tools / sync-users / sync-users.go

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index 45b6e96b87331d0f76a6c95b36da642d0683f91a..4b679ffe1889b1bd8804a88d958f74dae2814a78 100644 (file)
--- a/tools/sync-users/sync-users.go
+++ b/tools/sync-users/sync-users.go
@@ -372,7 +372,7 @@ type userRecord struct {
 
 func needsUpdating(user arvados.User, record userRecord) bool {
        userData := userRecord{"", user.FirstName, user.LastName, user.IsActive, user.IsAdmin}
 
 func needsUpdating(user arvados.User, record userRecord) bool {
        userData := userRecord{"", user.FirstName, user.LastName, user.IsActive, user.IsAdmin}

-       recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Admin}
+       recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Active && record.Admin}

        return userData != recordData
 }
 
        return userData != recordData
 }
 


@@ -444,7 +444,6 @@ func ProcessRecord(cfg *ConfigParams, record userRecord, userIDToUUID map[string
                        }
                }
        }
                        }
                }
        }

-       allUsers[record.UserID] = user

        if createRequired {
                log.Printf("Created user %q", record.UserID)
        }
        if createRequired {
                log.Printf("Created user %q", record.UserID)
        }