From 9f49c1af46f9272c25db44c6e3e6ff9ec96aad4c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 11 Jun 2019 05:55:16 -0600 Subject: Prohibit use of positional args with --import I took the liberty of combining related checks together so as to avoid a little duplication; if this is not a Go best practice, I will revert. I also made a minor wording adjustment to an error message for clarity. Also: update wording of man page. Signed-off-by: Ed Santiago --- cmd/podman/restore.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'cmd/podman') diff --git a/cmd/podman/restore.go b/cmd/podman/restore.go index 4d715ad4f..6e445e5df 100644 --- a/cmd/podman/restore.go +++ b/cmd/podman/restore.go @@ -76,11 +76,16 @@ func restoreCmd(c *cliconfig.RestoreValues, cmd *cobra.Command) error { return errors.Errorf("--tcp-established cannot be used with --name") } - if (c.Import != "") && (c.All || c.Latest) { - return errors.Errorf("Cannot use --import and --all or --latest at the same time") + argLen := len(c.InputArgs) + if c.Import != "" { + if c.All || c.Latest { + return errors.Errorf("Cannot use --import with --all or --latest") + } + if argLen > 0 { + return errors.Errorf("Cannot use --import with positional arguments") + } } - argLen := len(c.InputArgs) if (c.All || c.Latest) && argLen > 0 { return errors.Errorf("no arguments are needed with --all or --latest") } -- cgit v1.2.3-54-g00ecf