opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-06 05:37:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3290 from edsantiago/bats

Browse Source 
BATS tests - get working again
This commit is contained in:
OpenShift Merge Robot
2019-06-11 21:21:33 +02:00
committed by GitHub
parent 130f6cba8c 9f49c1af46
commit c385f33cdf
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/podman/restore.go
View File

@@ -76,8 +76,22 @@ 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")
}
}
if (c.All || c.Latest) && argLen > 0 {
return errors.Errorf("no arguments are needed with --all or --latest")
}
if argLen < 1 && !c.All && !c.Latest && c.Import == "" {
return errors.Errorf("you must provide at least one name or id")
}
return runtime.Restore(getContext(), c, options)
}