Merge branch '12462-search-hyphen'

[arvados.git] / tools / arv-sync-groups / arv-sync-groups.go

diff --git a/tools/arv-sync-groups/arv-sync-groups.go b/tools/arv-sync-groups/arv-sync-groups.go
index a1a73ca923ba4d1bd60a0e1a756f9739b3ab9438..d7efdefb6f68a791c1417c05357b5f2636227e84 100644 (file)
--- a/tools/arv-sync-groups/arv-sync-groups.go
+++ b/tools/arv-sync-groups/arv-sync-groups.go
@@ -335,15 +335,25 @@ func doMain(cfg *ConfigParams) error {
 }
 
 // ProcessFile reads the CSV file and process every record
-func ProcessFile(cfg *ConfigParams, f *os.File, userIDToUUID map[string]string, groupNameToUUID map[string]string, remoteGroups map[string]*GroupInfo, allUsers map[string]arvados.User) (groupsCreated, membersAdded, membersSkipped int, err error) {
+func ProcessFile(
+       cfg *ConfigParams,
+       f *os.File,
+       userIDToUUID map[string]string,
+       groupNameToUUID map[string]string,
+       remoteGroups map[string]*GroupInfo,
+       allUsers map[string]arvados.User,
+) (groupsCreated, membersAdded, membersSkipped int, err error) {
+       lineNo := 0
        csvReader := csv.NewReader(f)
+       csvReader.FieldsPerRecord = 2
        for {
                record, e := csvReader.Read()
                if e == io.EOF {
                        break
                }
+               lineNo++
                if e != nil {
-                       err = fmt.Errorf("error reading %q: %s", cfg.Path, err)
+                       err = fmt.Errorf("error parsing %q, line %d", cfg.Path, lineNo)
                        return
                }
                groupName := strings.TrimSpace(record[0])