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/oci.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/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index ba68de6fd..7dc32a314 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -110,7 +110,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image // Only use image command if the user did not manually set an // entrypoint. command := s.Command - if (command == nil || len(command) == 0) && img != nil && (s.Entrypoint == nil || len(s.Entrypoint) == 0) { + if len(command) == 0 && img != nil && len(s.Entrypoint) == 0 { newCmd, err := img.Cmd(ctx) if err != nil { return nil, err |