github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20994 from janetkuo/fix-get-repliasets

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-10 20:31:50 -08:00
commit 60432ab25b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/unversioned/helpers.go
View File

@ -81,13 +81,13 @@ func SetAsLabelSelector(ls labels.Set) *LabelSelector {
// FormatLabelSelector convert labelSelector into plain string // FormatLabelSelector convert labelSelector into plain string
func FormatLabelSelector(labelSelector *LabelSelector) string { func FormatLabelSelector(labelSelector *LabelSelector) string {
var l string selector, err := LabelSelectorAsSelector(labelSelector)
if selector, err := LabelSelectorAsSelector(labelSelector); err != nil { if err != nil {
l = selector.String() return "<error>"
} else {
l = "<error>"
} }
if l == "" {
l := selector.String()
if len(l) == 0 {
l = "<none>" l = "<none>"
} }
return l return l