diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-02 14:28:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 14:28:25 -0400 |
| commit | 819a4e02888b92c3120f513f398993a165f69028 (patch) | |
| tree | ef5fdac26037186d025ef002ff907166eb77ee9e /cmd/podman/common/specgen.go | |
| parent | 1132bcfeb5a8dca56d99c50882abc6e7775ac897 (diff) | |
| parent | 1492f3c936a0f6180db61a6500371aceebc37e39 (diff) | |
| download | podman-819a4e02888b92c3120f513f398993a165f69028.tar.gz podman-819a4e02888b92c3120f513f398993a165f69028.tar.bz2 podman-819a4e02888b92c3120f513f398993a165f69028.zip | |
Merge pull request #7895 from zhangguanzhang/run-ctr-restartPolicy-with-rm
[podman run] --rm option shold conflicts with --restart
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index e7b88eb3f..84ae70b6a 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -233,7 +233,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string // validate flags as needed if err := c.validate(); err != nil { - return nil + return err } s.User = c.User |