github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch: Fix swallowed errors in normalizeSliceOrder()

Browse Source
This commit is contained in:
Lars Lehtonen 2017-09-27 19:16:49 -07:00
parent 03db535f90
commit 1bdc657425
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
View File

@ -515,6 +515,9 @@ func normalizeSliceOrder(toSort, order []interface{}, mergeKey string, kind refl
return nil, err return nil, err
} }
toSort, toDelete, err = extractToDeleteItems(toSort) toSort, toDelete, err = extractToDeleteItems(toSort)
if err != nil {
return nil, err
}
} }
sort.SliceStable(toSort, func(i, j int) bool { sort.SliceStable(toSort, func(i, j int) bool {