Merge branch '15928-fs-deadlock'

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

diff --git a/tools/sync-groups/sync-groups.go b/tools/sync-groups/sync-groups.go
index 10569b2e139b89a2904820ab62dab6cbc3a747b5..7c5cd0558bbbc2927f4758fa93e2ec53920f0726 100644 (file)
--- a/tools/sync-groups/sync-groups.go
+++ b/tools/sync-groups/sync-groups.go
@@ -16,7 +16,7 @@ import (
        "os"
        "strings"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 var version = "dev"
@@ -217,7 +217,7 @@ func SetParentGroup(cfg *ConfigParams) error {
                        return fmt.Errorf("error searching for parent group: %s", err)
                }
                if len(gl.Items) == 0 {
-                       // Default parent group not existant, create one.
+                       // Default parent group does not exist, create it.
                        if cfg.Verbose {
                                log.Println("Default parent group not found, creating...")
                        }
@@ -510,8 +510,8 @@ func GetRemoteGroups(cfg *ConfigParams, allUsers map[string]arvados.User) (remot
                                Operand:  group.UUID,
                        }, {
                                Attr:     "head_uuid",
-                               Operator: "like",
-                               Operand:  "%-tpzed-%",
+                               Operator: "is_a",
+                               Operand:  "arvados#user",
                        }},
                }
                // User -> Group filter
@@ -534,8 +534,8 @@ func GetRemoteGroups(cfg *ConfigParams, allUsers map[string]arvados.User) (remot
                                Operand:  group.UUID,
                        }, {
                                Attr:     "tail_uuid",
-                               Operator: "like",
-                               Operand:  "%-tpzed-%",
+                               Operator: "is_a",
+                               Operand:  "arvados#user",
                        }},
                }
                g2uLinks, err := GetAll(cfg.Client, "links", g2uFilter, &LinkList{})