github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

alias local packagename for pkg/util/errors

Browse Source
This commit is contained in:
eulerzgy
2015-10-14 13:18:37 +08:00
parent 0338e0ef53
commit f8f9afb874
29 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/label.go
View File

@@ -28,7 +28,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/strategicpatch"
"k8s.io/kubernetes/pkg/util/validation"
)
@@ -106,7 +106,7 @@ func validateNoOverwrites(meta *api.ObjectMeta, labels map[string]string) error
allErrs = append(allErrs, fmt.Errorf("'%s' already has a value (%s), and --overwrite is false", key, value))
}
}
return errors.NewAggregate(allErrs)
return utilerrors.NewAggregate(allErrs)
}
func parseLabels(spec []string) (map[string]string, []string, error) {