Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
64a68afa
Commit
64a68afa
authored
Jul 31, 2015
by
Jerzy Szczepkowski
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10341 from feihujiang/removeDuplicateSource
Remove the duplicate source (filename) in error message
parents
95072f2e
4553e410
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
visitor.go
pkg/kubectl/resource/visitor.go
+4
-4
No files found.
pkg/kubectl/resource/visitor.go
View file @
64a68afa
...
@@ -217,7 +217,7 @@ type URLVisitor struct {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment