safcm: group_order: higher priority for listed groups over remaining groups

[safcm/safcm.git] / cmd / safcm / sync_sync.go

diff --git a/cmd/safcm/sync_sync.go b/cmd/safcm/sync_sync.go
index f8aeea2517031c69f214f04d8b13268f1f90ab3c..8b4cec45d0ba837cc490ac332a9b5d124883c136 100644 (file)
--- a/cmd/safcm/sync_sync.go
+++ b/cmd/safcm/sync_sync.go
@@ -19,6 +19,7 @@ package main
 
 import (
        "fmt"
+       "math"
        "os"
        "path/filepath"
        "sort"
@@ -91,7 +92,7 @@ func (s *Sync) hostSyncReq(detectedGroups []string) (
        allFiles := make(map[string]*safcm.File)
        allPackagesMap := make(map[string]bool) // map to deduplicate
        allServicesMap := make(map[string]bool) // map to deduplicate
-       var allCommands []string
+       var allCommands []*safcm.Command
 
        for _, group := range groups {
                // Skip non-existent group directories
@@ -188,10 +189,10 @@ func (s *Sync) resolveHostGroups(detectedGroups []string) (
        // Early entries have higher priorities
        groupPriority := make(map[string]int)
        for i, x := range s.config.GroupOrder {
-               groupPriority[x] = i + 1
+               groupPriority[x] = math.MinInt32 + i + 1
        }
        // Host itself always has highest priority
-       groupPriority[s.host.Name] = -1
+       groupPriority[s.host.Name] = math.MinInt32
 
        // Sort groups after priority and name
        sort.Slice(groups, func(i, j int) bool {