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

Merge pull request #10341 from feihujiang/removeDuplicateSource

Browse Source 
Remove the duplicate source (filename) in error message
This commit is contained in:
Jerzy Szczepkowski 2015-07-31 12:57:22 +02:00
commit 64a68afadb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/resource/visitor.go
View File

@ -217,7 +217,7 @@ type URLVisitor struct {
func (v *URLVisitor) Visit(fn VisitorFunc) error { func (v *URLVisitor) Visit(fn VisitorFunc) error {
res, err := http.Get(v.URL.String()) res, err := http.Get(v.URL.String())
if err != nil { if err != nil {
return fmt.Errorf("unable to access URL %q: %v\n", v.URL, err) return err
} }
defer res.Body.Close() defer res.Body.Close()
if res.StatusCode != 200 { if res.StatusCode != 200 {
@ -415,7 +415,7 @@ func (v *FileVisitor) Visit(fn VisitorFunc) error {
} else { } else {
var err error var err error
if f, err = os.Open(v.Path); err != nil { 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() defer f.Close()
@ -464,12 +464,12 @@ func (v *StreamVisitor) Visit(fn VisitorFunc) error {
continue continue
} }
if err := ValidateSchema(ext.RawJSON, v.Schema); err != nil { 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) info, err := v.InfoForData(ext.RawJSON, v.Source)
if err != nil { if err != nil {
if v.IgnoreErrors { 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)) glog.V(4).Infof("Unreadable: %s", string(ext.RawJSON))
continue continue
} }