diff options
| author | zhangguanzhang <zhangguanzhang@qq.com> | 2020-10-02 21:56:04 +0800 |
|---|---|---|
| committer | zhangguanzhang <zhangguanzhang@qq.com> | 2020-10-02 21:57:37 +0800 |
| commit | 1492f3c936a0f6180db61a6500371aceebc37e39 (patch) | |
| tree | 126ba7775a7ca86b8cc6e7d5edc9af3d73201e86 /cmd | |
| parent | ff3aa2b3d1b9765e0f09ed15dcf160065b54c889 (diff) | |
| download | podman-1492f3c936a0f6180db61a6500371aceebc37e39.tar.gz podman-1492f3c936a0f6180db61a6500371aceebc37e39.tar.bz2 podman-1492f3c936a0f6180db61a6500371aceebc37e39.zip | |
--rm option shold conflicts with --restart
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/createparse.go | 2 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go index 059f9050f..09ee5aa0c 100644 --- a/cmd/podman/common/createparse.go +++ b/cmd/podman/common/createparse.go @@ -10,7 +10,7 @@ import ( func (c *ContainerCLIOpts) validate() error { var () if c.Rm && c.Restart != "" && c.Restart != "no" { - return errors.Errorf("the --rm option conflicts with --restart") + return errors.Errorf(`the --rm option conflicts with --restart, when the restartPolicy is not "" and "no"`) } if _, err := util.ValidatePullType(c.Pull); err != nil { 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 |