github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12675 from pweil-/dont-swallow-errors

Browse Source 
don't swallow bad request errors
This commit is contained in:
Saad Ali
2015-08-19 17:01:51 -07:00
parent ee89f55bb9 f1d0835235
commit 49a569a457
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubectl/resource/selector.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package resource package resource
import ( import (
"github.com/golang/glog" "fmt"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
@@ -49,11 +49,10 @@ func (r *Selector) Visit(fn VisitorFunc) error {
if err != nil { if err != nil {
if errors.IsBadRequest(err) || errors.IsNotFound(err) { if errors.IsBadRequest(err) || errors.IsNotFound(err) {
if r.Selector.Empty() { if r.Selector.Empty() {
glog.V(2).Infof("Unable to list %q: %v", r.Mapping.Resource, err) return fmt.Errorf("Unable to list %q: %v", r.Mapping.Resource, err)
} else { } else {
glog.V(2).Infof("Unable to find %q that match the selector %q: %v", r.Mapping.Resource, r.Selector, err) return fmt.Errorf("Unable to find %q that match the selector %q: %v", r.Mapping.Resource, r.Selector, err)
} }
return nil
} }
return err return err
} }