opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 00:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors found in coverity scan

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-04-30 16:25:45 -04:00
parent 1218d70915
commit 7d37f4bbfe
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime_pod_linux.go
View File

@ -236,7 +236,7 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool)
} }
if err := r.removeContainer(ctx, ctr, force, false, true); err != nil { if err := r.removeContainer(ctx, ctr, force, false, true); err != nil {
if removalErr != nil { if removalErr == nil {
removalErr = err removalErr = err
} else { } else {
logrus.Errorf("Error removing container %s from pod %s: %v", ctr.ID(), p.ID(), err) logrus.Errorf("Error removing container %s from pod %s: %v", ctr.ID(), p.ID(), err)

1
pkg/util/mountOpts.go
View File

@ -108,6 +108,7 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string
if foundZ { if foundZ {
return nil, errors.Wrapf(ErrDupeMntOption, "only one of 'z' and 'Z' can be used") return nil, errors.Wrapf(ErrDupeMntOption, "only one of 'z' and 'Z' can be used")
} }
foundZ = true
default: default:
return nil, errors.Wrapf(ErrBadMntOption, "unknown mount option %q", opt) return nil, errors.Wrapf(ErrBadMntOption, "unknown mount option %q", opt)
} }