From 0dc166a9fa709a73357a817878d6cb1a6d751f1b Mon Sep 17 00:00:00 2001 From: xilabao Date: Tue, 22 Nov 2016 14:14:15 +0800 Subject: [PATCH] Remove duplicate get errs --- pkg/kubectl/cmd/get.go | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 7fab4c5d4732..b4772dc2d6d2 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -31,6 +31,7 @@ import ( "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/interrupt" + "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/watch" ) @@ -392,6 +393,7 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ } allErrs := []error{} + errs := sets.NewString() infos, err := r.Infos() if err != nil { allErrs = append(allErrs, err) @@ -444,7 +446,10 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ } printer, err = f.PrinterForMapping(cmd, mapping, allNamespaces) if err != nil { - allErrs = append(allErrs, err) + if !errs.Has(err.Error()) { + errs.Insert(err.Error()) + allErrs = append(allErrs, err) + } continue } @@ -464,7 +469,10 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ filteredResourceCount++ continue } - allErrs = append(allErrs, err) + if !errs.Has(err.Error()) { + errs.Insert(err.Error()) + allErrs = append(allErrs, err) + } } if resourcePrinter, found := printer.(*kubectl.HumanReadablePrinter); found { @@ -487,12 +495,18 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ } if err := printer.PrintObj(original, w); err != nil { - allErrs = append(allErrs, err) + if !errs.Has(err.Error()) { + errs.Insert(err.Error()) + allErrs = append(allErrs, err) + } } continue } if err := printer.PrintObj(original, w); err != nil { - allErrs = append(allErrs, err) + if !errs.Has(err.Error()) { + errs.Insert(err.Error()) + allErrs = append(allErrs, err) + } continue } }