// 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 == "" {
return err
}
if uID == "" {
- emptyUserIDs = append(emptyUserIDs, u.UUID)
- log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+ if u.UUID != cfg.AnonUserUUID && u.UUID != cfg.SysUserUUID {
+ emptyUserIDs = append(emptyUserIDs, u.UUID)
+ log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+ }
continue
}
if cfg.CaseInsensitive {
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
}
}
}
}
- allUsers[record.UserID] = user
if createRequired {
log.Printf("Created user %q", record.UserID)
}