X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0ec937fd42be7f1d3757eba48fa944627dfe591d..da532b4d0a1939bbfa063beaffc53582aa3907d6:/tools/sync-users/sync-users.go

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index f9f8b6046c..4b679ffe18 100644
--- a/tools/sync-users/sync-users.go
+++ b/tools/sync-users/sync-users.go
@@ -123,8 +123,10 @@ func ParseFlags(cfg *ConfigParams) error {
 	// Input file as a required positional argument
 	if flags.NArg() == 0 {
 		return fmt.Errorf("please provide a path to an input file")
+	} else if flags.NArg() > 1 {
+		return fmt.Errorf("please provide just one input file argument")
 	}
-	srcPath := &os.Args[flags.NFlag()+1]
+	srcPath := &os.Args[len(os.Args)-1]
 
 	// Validations
 	if *srcPath == "" {
@@ -370,7 +372,7 @@ type userRecord struct {
 
 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
 }
 
@@ -442,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)
 	}