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 <[email protected]>
containers · Jun 11, 2019 · 9f49c1a · 9f49c1a
1 parent bd0582d
commit 9f49c1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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")
 	}

diff --git a/docs/podman-container-restore.1.md b/docs/podman-container-restore.1.md
@@ -45,8 +45,8 @@ connections.
 **--import, -i**
 
 Import a checkpoint tar.gz file, which was exported by Podman. This can be used
-to import a checkpointed container from another host. It is not necessary to specify
-a container when restoring from an exported checkpoint.
+to import a checkpointed container from another host. Do not specify a *container*
+argument when using this option.
 
 **--name, -n**