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

Change logic for detecting conflicting flags in ps

Browse Source 
There's no reason --size cannot be used together with a Go
template - in fact, using a Go template for {{.Size}} without
--size being passed will not work.

Allow use of --namespace and --size with Go templates, but not
with --quiet. Do not allow --namespace and --size at the same
time.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2018-07-13 16:00:23 -04:00
parent 2bdefc6c1e
commit 259136c36c
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/podman/ps.go
View File

@ -282,22 +282,16 @@ func checkFlagsPassed(c *cli.Context) error {
if c.Int("last") >= 0 && c.Bool("latest") {
return errors.Errorf("last and latest are mutually exclusive")
}
// quiet, size, namespace, and format with Go template are mutually exclusive
flags := 0
// Quiet conflicts with size, namespace, and format with a Go template
if c.Bool("quiet") {
flags++
if c.Bool("size") || c.Bool("namespace") || (c.IsSet("format") &&
c.String("format") != formats.JSONString) {
return errors.Errorf("quiet conflicts with size, namespace, and format with go template")
}
}
if c.Bool("size") {
flags++
}
if c.Bool("namespace") {
flags++
}
if c.IsSet("format") && c.String("format") != formats.JSONString {
flags++
}
if flags > 1 {
return errors.Errorf("quiet, size, namespace, and format with Go template are mutually exclusive")
// Size and namespace conflict with each other
if c.Bool("size") && c.Bool("namespace") {
return errors.Errorf("size and namespace options conflict")
}
return nil
}