Merge pull request #1392 from technosophos/fix/1374-accessing-nil-obj-in-error

fix(tiller): fix nil pointers in error messages
pull/1405/head
Matt Butcher 9 years ago committed by GitHub
commit b42f067579

@ -100,7 +100,7 @@ func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Releas
for _, item := range list.Items { for _, item := range list.Items {
rls, err := decodeRelease(item.Data["release"]) rls, err := decodeRelease(item.Data["release"])
if err != nil { if err != nil {
logerrf(err, "list: failed to decode release: %s", rls) logerrf(err, "list: failed to decode release: %v", item)
continue continue
} }
if filter(rls) { if filter(rls) {
@ -201,7 +201,7 @@ func (cfgmaps *ConfigMaps) Delete(key string) (rls *rspb.Release, err error) {
return nil, ErrReleaseNotFound return nil, ErrReleaseNotFound
} }
logerrf(err, "delete: failed to get release %q", rls.Name) logerrf(err, "delete: failed to get release %q", key)
return nil, err return nil, err
} }
// delete the release // delete the release

Loading…
Cancel
Save