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 <santiago@redhat.com>

1 files changed, 8 insertions, 3 deletions

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")
 	}