From 4553e410d3d36598bc013c18eedb1b6aa9f0aa8d Mon Sep 17 00:00:00 2001 From: feihujiang Date: Thu, 25 Jun 2015 16:41:45 +0800 Subject: [PATCH] Remove the duplicate source (filename) in error message --- pkg/kubectl/resource/visitor.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/resource/visitor.go b/pkg/kubectl/resource/visitor.go index ca79b2ded5d..3107ed16f75 100644 --- a/pkg/kubectl/resource/visitor.go +++ b/pkg/kubectl/resource/visitor.go @@ -217,7 +217,7 @@ type URLVisitor struct { func (v *URLVisitor) Visit(fn VisitorFunc) error { res, err := http.Get(v.URL.String()) if err != nil { - return fmt.Errorf("unable to access URL %q: %v\n", v.URL, err) + return err } defer res.Body.Close() if res.StatusCode != 200 { @@ -415,7 +415,7 @@ func (v *FileVisitor) Visit(fn VisitorFunc) error { } else { var err error if f, err = os.Open(v.Path); err != nil { - return fmt.Errorf("unable to open %q: %v", v.Path, err) + return err } } defer f.Close() @@ -464,12 +464,12 @@ func (v *StreamVisitor) Visit(fn VisitorFunc) error { continue } if err := ValidateSchema(ext.RawJSON, v.Schema); err != nil { - return err + return fmt.Errorf("error validating %q: %v", v.Source, err) } info, err := v.InfoForData(ext.RawJSON, v.Source) if err != nil { if v.IgnoreErrors { - fmt.Fprintf(os.Stderr, "error: could not read an encoded object from %s: %v\n", v.Source, err) + fmt.Fprintf(os.Stderr, "error: could not read an encoded object: %v\n", err) glog.V(4).Infof("Unreadable: %s", string(ext.RawJSON)) continue }