Merge pull request #35115 from k82cn/k8s_35092

Automatic merge from submit-queue Did not print 'No resources found.' if error. fixes #35092 .

Merge pull request #35115 from k82cn/k8s_35092
68e68052 · Kubernetes Submit Queue · GitHub · 47743a5c · 930cd155 · 68e68052
Commit 68e68052 authored Oct 21, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

get.go pkg/kubectl/cmd/get.go +2 -2

No files found.
--- a/pkg/kubectl/cmd/get.go
+++ b/pkg/kubectl/cmd/get.go
@@ -323,7 +323,7 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [
 			}
 			errs = append(errs, err)
 		}
-		if len(infos) == 0 {
+		if len(infos) == 0 && len(errs) == 0 {
 			outputEmptyListWarning(errOut)
 		}
@@ -375,7 +375,7 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [
 	if err != nil {
 		allErrs = append(allErrs, err)
 	}
-	if len(infos) == 0 {
+	if len(infos) == 0 && len(allErrs) == 0 {
 		outputEmptyListWarning(errOut)
 	}