diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-12 13:15:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 13:15:35 -0500 |
| commit | db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd (patch) | |
| tree | a1afbf91732f4b20b2cbacb460a3b7b60d6b6919 /pkg/specgen/generate/storage.go | |
| parent | 0ccc88813e3e3a385ecdefbe971c1664193cd682 (diff) | |
| parent | 8452b768ec96e84cd09766bddb65a34835844d6d (diff) | |
| download | podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.tar.gz podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.tar.bz2 podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.zip | |
Merge pull request #8947 from Luap99/cleanup-code
Fix problems reported by staticcheck
Diffstat (limited to 'pkg/specgen/generate/storage.go')
| -rw-r--r-- | pkg/specgen/generate/storage.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index f523ac5bf..63713726e 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -124,14 +124,10 @@ func finalizeMounts(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Ru // named volumes, and vice versa. // We'll delete the conflicts here as we supersede. for dest := range unifiedMounts { - if _, ok := baseVolumes[dest]; ok { - delete(baseVolumes, dest) - } + delete(baseVolumes, dest) } for dest := range unifiedVolumes { - if _, ok := baseMounts[dest]; ok { - delete(baseMounts, dest) - } + delete(baseMounts, dest) } // Supersede volumes-from/image volumes with unified volumes from above. |